Revbump. Heavily redo installation (installing into /usr/lib doesn't make sense, move to /opt). Remove thumbnail/mime stuff, that was not upstream code and pulls in a bunch of old gnome stuff. Add wrapper to deal with hackish handling of configuration dir, fixes bug 492274.

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

3 files changed, 36 insertions, 32 deletions

diff --git a/app-misc/xmind/ChangeLog b/app-misc/xmind/ChangeLog
index 9b42ab270c1d..1e07596d4acd 100644
--- a/app-misc/xmind/ChangeLog
+++ b/app-misc/xmind/ChangeLog
@@ -1,6 +1,15 @@
 # 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.7 2013/11/08 18:03:57 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/xmind/ChangeLog,v 1.8 2013/12/09 05:37:12 creffett Exp $
+
+*xmind-3.4.0.201311050558-r1 (09 Dec 2013)
+
+  09 Dec 2013; Chris Reffett <creffett@gentoo.org> +files/xmind-wrapper,
+  +xmind-3.4.0.201311050558-r1.ebuild, -xmind-3.4.0.201311050558.ebuild:
+  Revbump. Heavily redo installation (installing into /usr/lib doesn't make
+  sense, move to /opt). Remove thumbnail/mime stuff, that was not upstream code
+  and pulls in a bunch of old gnome stuff. Add wrapper to deal with hackish
+  handling of configuration dir, fixes bug 492274.
 
   09 Oct 2013; creffett <creffett@gentoo.org> ChangeLog:
   testing
diff --git a/app-misc/xmind/files/xmind-wrapper b/app-misc/xmind/files/xmind-wrapper
new file mode 100755
index 000000000000..728edce3e24a
--- /dev/null
+++ b/app-misc/xmind/files/xmind-wrapper
@@ -0,0 +1,8 @@
+#!/bin/bash
+#XMind wrapper script, copies configuration stuff into the user's local config dir if either 
+#the files aren't there or are older than the set in /opt (indicating that XMind has been upgraded)
+if [ ! -f ~/.xmind/configuration-cathy/config.ini -o ~/.xmind/configuration-cathy/config.ini -ot /opt/xmind/XMind/configuration/config.ini ]; then
+	mkdir -p ~/.xmind/configuration-cathy
+	cp -r /opt/xmind/XMind/configuration/* ~/.xmind/configuration-cathy/
+fi
+/opt/xmind/XMind/XMind
diff --git a/app-misc/xmind/xmind-3.4.0.201311050558.ebuild b/app-misc/xmind/xmind-3.4.0.201311050558-r1.ebuild
index 19cb04726ec1..4c10cf065d6f 100644
--- a/app-misc/xmind/xmind-3.4.0.201311050558.ebuild
+++ b/app-misc/xmind/xmind-3.4.0.201311050558-r1.ebuild
@@ -1,10 +1,10 @@
 # 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.4.0.201311050558.ebuild,v 1.1 2013/11/08 18:03:56 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/xmind/xmind-3.4.0.201311050558-r1.ebuild,v 1.1 2013/12/09 05:37:12 creffett Exp $
 
 EAPI=5
 
-inherit eutils multilib fdo-mime gnome2-utils
+inherit eutils multilib gnome2-utils
 
 MY_PN="${PN}-portable"
 MY_P="${MY_PN}-${PV}"
@@ -25,12 +25,12 @@ RDEPEND="
 
 S=${WORKDIR}
 
-QA_PRESTRIPPED="usr/$(get_libdir)/xmind/XMind/libcairo-swt.so"
+QA_PRESTRIPPED="opt/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
+	opt/xmind/Commons/plugins/org.eclipse.equinox.launcher.gtk.linux.x86_64_1.1.200.v20120522-1813/eclipse_1502.so
+	opt/xmind/Commons/plugins/org.eclipse.equinox.launcher.gtk.linux.x86_1.1.200.v20120522-1813/eclipse_1502.so
+	opt/xmind/XMind/libcairo-swt.so
+	opt/xmind/XMind/XMind
 "
 
 src_configure() {
@@ -39,14 +39,15 @@ src_configure() {
 	else
 		XDIR="XMind_Linux"
 	fi
-	mv -v "$XDIR" XMind || die
-	mv -v XMind/.eclipseproduct Commons || die
+	mv "$XDIR" XMind || die
+	mv XMind/.eclipseproduct Commons || die
 	cp "${FILESDIR}"/${PN}-3.4.0-config.ini Commons/configuration || die #Combined common+linux config.ini
 	# force data instance & config area to be at home/.xmind directory
 	sed -i -e '/-configuration/d' \
 		-e '/\.\/configuration/d' \
 		-e '/-data/d' \
-		-e '/\.\.\/Commons\/data\/workspace-cathy/d' XMind/XMind.ini || die
+        -e '/\.\.\/Commons\/data\/workspace-cathy/d' \
+		-e 's/\.\.\/Commons/\/opt\/xmind\/Commons/g' 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
 }
@@ -56,32 +57,22 @@ src_compile() {
 }
 
 src_install() {
-	local libdir="$(get_libdir)"
-	dodir   "/usr/${libdir}/xmind"
-	insinto "/usr/${libdir}/xmind"
-	doins   -r Commons
-	doins   -r XMind
+	insinto /opt/xmind
+	doins -r Commons XMind || die
+	fperms a+rx  "/opt/xmind/XMind/XMind"
 
-	exeinto "/usr/${libdir}/xmind/XMind"
-	doexe   XMind/XMind
-	dosym   "/usr/${libdir}/xmind/XMind/XMind" /usr/bin/xmind
+	dodir /opt/bin
+	exeinto /opt/bin
+	newexe "${FILESDIR}/xmind-wrapper" xmind
 
-	# insall icons
+	# install icons
 	local res
 	for res in 16 32 48; do
 		newicon -s ${res} "${WORKDIR}/xmind-icons/xmind.${res}.png" xmind.png
 	done
 
-	# insall MIME type
-	insinto /usr/share/mime/packages
-	doins   "${FILESDIR}/x-xmind.xml"
-
 	# make desktop entry
 	make_desktop_entry "xmind %F" XMind xmind Office "MimeType=application/x-xmind;"
-
-	insinto /etc/gconf/schemas
-	doins "${FILESDIR}/xmind.schemas"
-	dobin "${FILESDIR}/xmind-thumbnailer"
 }
 
 pkg_preinst() {
@@ -89,14 +80,10 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
 	gnome2_icon_cache_update
 	elog "For audio notes support, install media-sound/lame"
 }
 
 pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
 	gnome2_icon_cache_update
 }