fix .desktop files, version bump, remove old

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

7 files changed, 70 insertions, 220 deletions

diff --git a/x11-misc/spacefm/ChangeLog b/x11-misc/spacefm/ChangeLog
index cf0716c6a5e8..e70f1b2f59db 100644
--- a/x11-misc/spacefm/ChangeLog
+++ b/x11-misc/spacefm/ChangeLog
@@ -1,6 +1,14 @@
 # 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.29 2012/07/25 17:40:53 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/spacefm/ChangeLog,v 1.30 2012/08/16 22:06:25 hasufell Exp $
+
+*spacefm-0.7.11 (16 Aug 2012)
+
+  16 Aug 2012; Julian Ospald <hasufell@gentoo.org> -spacefm-0.7.6.ebuild,
+  -spacefm-0.7.7.ebuild, -spacefm-0.7.8.ebuild, -spacefm-0.7.9.ebuild,
+  spacefm-0.7.10.ebuild, +files/spacefm-0.7.10-desktopfiles.patch,
+  +spacefm-0.7.11.ebuild:
+  fix .desktop files, version bump, remove old
 
 *spacefm-0.7.10 (25 Jul 2012)
 
diff --git a/x11-misc/spacefm/files/spacefm-0.7.10-desktopfiles.patch b/x11-misc/spacefm/files/spacefm-0.7.10-desktopfiles.patch
new file mode 100644
index 000000000000..22334d31bfb2
--- /dev/null
+++ b/x11-misc/spacefm/files/spacefm-0.7.10-desktopfiles.patch
@@ -0,0 +1,38 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Thu Aug 16 21:51:41 UTC 2012
+Subject: desktop files
+
+fix several non-standard/deprecated entries
+
+--- data/spacefm.desktop.in
++++ data/spacefm.desktop.in
+@@ -1,8 +1,7 @@
+ [Desktop Entry]
+ Version=1.0
+-Encoding=UTF-8
+ _Name=SpaceFM
+-Categories=Application;System;Utility;Core;GTK;
++Categories=System;Utility;Core;GTK;
+ Exec=spacefm %F
+ Icon=spacefm
+ StartupNotify=true
+--- data/spacefm-find.desktop.in
++++ data/spacefm-find.desktop.in
+@@ -1,8 +1,7 @@
+ [Desktop Entry]
+ Version=1.0
+-Encoding=UTF-8
+ _Name=SpaceFM File Search
+-Categories=Application;Utility;GTK;
++Categories=Utility;GTK;
+ Exec=spacefm --find-files %F
+ Icon=spacefm-find
+ StartupNotify=true
+--- data/spacefm-folder-handler.desktop.in
++++ data/spacefm-folder-handler.desktop.in
+@@ -1,5 +1,4 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ _Name=SpaceFM Open Folder
+ _Comment=Open folder
+ TryExec=spacefm
diff --git a/x11-misc/spacefm/spacefm-0.7.10.ebuild b/x11-misc/spacefm/spacefm-0.7.10.ebuild
index 53834407043d..286d4491a71b 100644
--- a/x11-misc/spacefm/spacefm-0.7.10.ebuild
+++ b/x11-misc/spacefm/spacefm-0.7.10.ebuild
@@ -1,10 +1,10 @@
 # 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.10.ebuild,v 1.1 2012/07/25 17:40:53 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/spacefm/spacefm-0.7.10.ebuild,v 1.2 2012/08/16 22:06:25 hasufell Exp $
 
 EAPI=4
 
-inherit fdo-mime gnome2-utils linux-info
+inherit eutils fdo-mime gnome2-utils linux-info
 
 DESCRIPTION="A multi-panel tabbed file manager"
 HOMEPAGE="http://ignorantguru.github.com/spacefm/"
@@ -31,6 +31,10 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	sys-devel/gettext"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.7.10-desktopfiles.patch
+}
+
 src_configure() {
 	econf \
 		--htmldir=/usr/share/doc/${PF}/html \
diff --git a/x11-misc/spacefm/spacefm-0.7.8.ebuild b/x11-misc/spacefm/spacefm-0.7.11.ebuild
index d617b1790365..52bb8fa6fd6a 100644
--- a/x11-misc/spacefm/spacefm-0.7.8.ebuild
+++ b/x11-misc/spacefm/spacefm-0.7.11.ebuild
@@ -1,14 +1,15 @@
 # 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.8.ebuild,v 1.2 2012/06/17 17:31:44 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/spacefm/spacefm-0.7.11.ebuild,v 1.1 2012/08/16 22:06:25 hasufell Exp $
 
 EAPI=4
 
-inherit fdo-mime linux-info
+inherit eutils fdo-mime gnome2-utils linux-info
 
 DESCRIPTION="A multi-panel tabbed file manager"
 HOMEPAGE="http://ignorantguru.github.com/spacefm/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+SRC_URI="http://dev.gentoo.org/~hasufell/distfiles/${P}.tar.xz
+	mirror://sourceforge/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
@@ -31,16 +32,27 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	sys-devel/gettext"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.7.10-desktopfiles.patch
+}
+
 src_configure() {
 	econf \
 		--htmldir=/usr/share/doc/${PF}/html \
 		--disable-hal \
-		--enable-inotify
+		--enable-inotify \
+		--disable-pixmaps
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
 }
 
 pkg_postinst() {
 	fdo-mime_desktop_database_update
 	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+
 	einfo
 	elog "To mount as non-root user you need one of the following:"
 	elog "  sys-apps/udevil (recommended, see below)"
@@ -70,4 +82,5 @@ pkg_postinst() {
 pkg_postrm() {
 	fdo-mime_desktop_database_update
 	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
 }
diff --git a/x11-misc/spacefm/spacefm-0.7.6.ebuild b/x11-misc/spacefm/spacefm-0.7.6.ebuild
deleted file mode 100644
index f4b188713988..000000000000
--- a/x11-misc/spacefm/spacefm-0.7.6.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# 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.6.ebuild,v 1.2 2012/05/05 04:53:44 jdhore Exp $
-
-EAPI=4
-
-inherit fdo-mime linux-info
-
-DESCRIPTION="A multi-panel tabbed file manager"
-HOMEPAGE="http://ignorantguru.github.com/spacefm/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-libs/glib:2
-	dev-util/desktop-file-utils
-	sys-apps/dbus
-	>=sys-fs/udev-143
-	virtual/freedesktop-icon-theme
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:2
-	x11-libs/pango
-	x11-libs/startup-notification
-	x11-misc/shared-mime-info"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-src_configure() {
-	econf \
-		--htmldir=/usr/share/doc/${PF}/html \
-		--disable-hal \
-		--enable-inotify
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	einfo ""
-	elog "To mount as non-root user you need one of the following:"
-	elog "  sys-apps/pmount"
-	elog "  sys-fs/udisks:0"
-	elog "  sys-fs/udisks:2"
-	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
-	if ! has_version 'sys-fs/udisks' ; then
-		elog "When using SpaceFM without udisks, and without the udisks-daemon running,"
-		elog "you may need to enable kernel polling for device media changes to be detected."
-		elog "See /usr/share/doc/${PF}/html/spacefm-manual-en.html#devices-kernpoll"
-		has_version '<sys-fs/udev-173' && ewarn "You need at least udev-173"
-		kernel_is lt 2 6 38 && ewarn "You need at least kernel 2.6.38"
-		einfo
-	fi
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
diff --git a/x11-misc/spacefm/spacefm-0.7.7.ebuild b/x11-misc/spacefm/spacefm-0.7.7.ebuild
deleted file mode 100644
index 1a60a3f97eb1..000000000000
--- a/x11-misc/spacefm/spacefm-0.7.7.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# 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.7.ebuild,v 1.1 2012/05/28 02:58:10 hasufell Exp $
-
-EAPI=4
-
-inherit fdo-mime linux-info
-
-DESCRIPTION="A multi-panel tabbed file manager"
-HOMEPAGE="http://ignorantguru.github.com/spacefm/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-libs/glib:2
-	dev-util/desktop-file-utils
-	sys-apps/dbus
-	>=sys-fs/udev-143
-	virtual/freedesktop-icon-theme
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:2
-	x11-libs/pango
-	x11-libs/startup-notification
-	x11-misc/shared-mime-info"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-src_configure() {
-	econf \
-		--htmldir=/usr/share/doc/${PF}/html \
-		--disable-hal \
-		--enable-inotify
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	einfo ""
-	elog "To mount as non-root user you need one of the following:"
-	elog "  sys-apps/pmount"
-	elog "  sys-fs/udisks:0"
-	elog "  sys-fs/udisks:2"
-	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
-	if ! has_version 'sys-fs/udisks' ; then
-		elog "When using SpaceFM without udisks, and without the udisks-daemon running,"
-		elog "you may need to enable kernel polling for device media changes to be detected."
-		elog "See /usr/share/doc/${PF}/html/spacefm-manual-en.html#devices-kernpoll"
-		has_version '<sys-fs/udev-173' && ewarn "You need at least udev-173"
-		kernel_is lt 2 6 38 && ewarn "You need at least kernel 2.6.38"
-		einfo
-	fi
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
diff --git a/x11-misc/spacefm/spacefm-0.7.9.ebuild b/x11-misc/spacefm/spacefm-0.7.9.ebuild
deleted file mode 100644
index f04d5a1d3278..000000000000
--- a/x11-misc/spacefm/spacefm-0.7.9.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# 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.9.ebuild,v 1.1 2012/07/13 16:33:37 hasufell Exp $
-
-EAPI=4
-
-inherit fdo-mime linux-info
-
-DESCRIPTION="A multi-panel tabbed file manager"
-HOMEPAGE="http://ignorantguru.github.com/spacefm/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-libs/glib:2
-	dev-util/desktop-file-utils
-	sys-apps/dbus
-	>=sys-fs/udev-143
-	virtual/freedesktop-icon-theme
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:2
-	x11-libs/pango
-	x11-libs/startup-notification
-	x11-misc/shared-mime-info"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-src_configure() {
-	econf \
-		--htmldir=/usr/share/doc/${PF}/html \
-		--disable-hal \
-		--enable-inotify
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	einfo
-	elog "To mount as non-root user you need one of the following:"
-	elog "  sys-apps/udevil (recommended, see below)"
-	elog "  sys-apps/pmount"
-	elog "  sys-fs/udisks:0"
-	elog "  sys-fs/udisks:2"
-	elog "To support ftp/nfs/smb/ssh URLs in the path bar you need:"
-	elog "  sys-apps/udevil"
-	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
-	if ! has_version 'sys-fs/udisks' ; then
-		elog "When using SpaceFM without udisks, and without the udisks-daemon running,"
-		elog "you may need to enable kernel polling for device media changes to be detected."
-		elog "See /usr/share/doc/${PF}/html/spacefm-manual-en.html#devices-kernpoll"
-		has_version '<sys-fs/udev-173' && ewarn "You need at least udev-173"
-		kernel_is lt 2 6 38 && ewarn "You need at least kernel 2.6.38"
-		einfo
-	fi
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}