Make several small fixes to ebuild, credit to hasufell for suggestions

(Portage version: 2.2.0_alpha186/cvs/Linux x86_64, signed Manifest commit with key 42618354)

2 files changed, 26 insertions, 23 deletions

diff --git a/app-misc/xmind/ChangeLog b/app-misc/xmind/ChangeLog
index d018a59798f1..9ab6379403d2 100644
--- a/app-misc/xmind/ChangeLog
+++ b/app-misc/xmind/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/xmind
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/xmind/ChangeLog,v 1.5 2013/06/30 12:44:12 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/xmind/ChangeLog,v 1.6 2013/07/08 02:10:42 creffett Exp $
+
+  08 Jul 2013; Chris Reffett <creffett@gentoo.org>
+  xmind-3.3.1.201212250029.ebuild:
+  Make several small fixes to ebuild, credit to hasufell for suggestions
 
   30 Jun 2013; Agostino Sarubbo <ago@gentoo.org>
   xmind-3.3.1.201212250029.ebuild:
diff --git a/app-misc/xmind/xmind-3.3.1.201212250029.ebuild b/app-misc/xmind/xmind-3.3.1.201212250029.ebuild
index b539d02c0c87..6c4480c78d16 100644
--- a/app-misc/xmind/xmind-3.3.1.201212250029.ebuild
+++ b/app-misc/xmind/xmind-3.3.1.201212250029.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/xmind/xmind-3.3.1.201212250029.ebuild,v 1.5 2013/06/30 12:44:12 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/xmind/xmind-3.3.1.201212250029.ebuild,v 1.6 2013/07/08 02:10:42 creffett Exp $
 
 EAPI=5
 
@@ -9,7 +9,7 @@ inherit eutils multilib fdo-mime gnome2-utils
 MY_PN="${PN}-portable"
 MY_P="${MY_PN}-${PV}"
 
-DESCRIPTION="A brainstorming and mind mapping software tool."
+DESCRIPTION="A brainstorming and mind mapping software tool"
 HOMEPAGE="http://www.xmind.net"
 SRC_URI="http://dl2.xmind.net/xmind-downloads/${MY_P}.zip
 	http://dev.gentoo.org/~creffett/distfiles/xmind-icons.tar.xz"
@@ -18,20 +18,19 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-DEPEND="
+RDEPEND="
 	>=virtual/jre-1.5
 	x11-libs/gtk+:2
 "
-RDEPEND="${DEPEND}"
 
 S=${WORKDIR}
 
-QA_PRESTRIPPED="/usr/$(get_libdir)/xmind/XMind/libcairo-swt.so"
+QA_PRESTRIPPED="usr/$(get_libdir)/xmind/XMind/libcairo-swt.so"
 QA_FLAGS_IGNORED="
-	/usr/$(get_libdir)/xmind/Commons/plugins/org.eclipse.equinox.launcher.gtk.linux.x86_64_1.1.200.v20120522-1813/eclipse_1502.so
-	/usr/$(get_libdir)/xmind/Commons/plugins/org.eclipse.equinox.launcher.gtk.linux.x86_1.1.200.v20120522-1813/eclipse_1502.so
-	/usr/$(get_libdir)/xmind/XMind/libcairo-swt.so
-	/usr/$(get_libdir)/xmind/XMind/XMind
+	usr/$(get_libdir)/xmind/Commons/plugins/org.eclipse.equinox.launcher.gtk.linux.x86_64_1.1.200.v20120522-1813/eclipse_1502.so
+	usr/$(get_libdir)/xmind/Commons/plugins/org.eclipse.equinox.launcher.gtk.linux.x86_1.1.200.v20120522-1813/eclipse_1502.so
+	usr/$(get_libdir)/xmind/XMind/libcairo-swt.so
+	usr/$(get_libdir)/xmind/XMind/XMind
 "
 
 src_configure() {
@@ -40,24 +39,24 @@ src_configure() {
 	else
 		XDIR="XMind_Linux"
 	fi
-	mv -v "$XDIR" XMind
-	mv -v XMind/.eclipseproduct XMind/configuration Commons
+	mv -v "$XDIR" XMind || die
+	mv -v XMind/.eclipseproduct XMind/configuration Commons || die
 
 	# force data instance & config area to be at home/.xmind directory
-	sed -i -e '/-configuration/d' XMind/XMind.ini || die
-	sed -i -e '/\.\/configuration/d' XMind/XMind.ini || die
-	sed -i -e '/-data/d' XMind/XMind.ini || die
-	sed -i -e '/\.\.\/Commons\/data\/workspace-cathy/d' XMind/XMind.ini || die
+	sed -i -e '/-configuration/d' \
+		-e '/\.\/configuration/d' \
+		-e '/-data/d' \
+		-e '/\.\.\/Commons\/data\/workspace-cathy/d' XMind/XMind.ini || die
 	echo '-Dosgi.instance.area=@user.home/.xmind/workspace-cathy' >> XMind/XMind.ini || die
 	echo '-Dosgi.configuration.area=@user.home/.xmind/configuration-cathy' >> XMind/XMind.ini || die
 }
 
 src_compile() {
-	:;
+	:
 }
 
 src_install() {
-	libdir="$(get_libdir)"
+	local libdir="$(get_libdir)"
 	dodir   "/usr/${libdir}/xmind"
 	insinto "/usr/${libdir}/xmind"
 	doins   -r Commons
@@ -69,9 +68,8 @@ src_install() {
 
 	# insall icons
 	local res
-		for res in 16 32 48; do
-		insinto /usr/share/icons/hicolor/${res}x${res}/apps
-		newins "${WORKDIR}/xmind-icons/xmind.${res}.png" xmind.png
+	for res in 16 32 48; do
+		newicon -s ${res} "${WORKDIR}/xmind-icons/xmind.${res}.png" xmind.png
 	done
 
 	# insall MIME type
@@ -79,8 +77,7 @@ src_install() {
 	doins   "${FILESDIR}/x-xmind.xml"
 
 	# make desktop entry
-	make_desktop_entry xmind XMind xmind Office "MimeType=application/x-xmind;"
-	sed -i -e "/^Exec/s/$/ %F/" "${ED}"/usr/share/applications/*.desktop
+	make_desktop_entry "xmind %F" XMind xmind Office "MimeType=application/x-xmind;"
 
 	insinto /etc/gconf/schemas
 	doins "${FILESDIR}/xmind.schemas"
@@ -99,5 +96,7 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
 	gnome2_icon_cache_update
 }