From 7bc51765d6350f3918afc777067dfc77f15c3a86 Mon Sep 17 00:00:00 2001 From: Chris Reffett Date: Mon, 9 Dec 2013 05:37:12 +0000 Subject: 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) --- app-misc/xmind/ChangeLog | 11 ++- app-misc/xmind/files/xmind-wrapper | 8 ++ app-misc/xmind/xmind-3.4.0.201311050558-r1.ebuild | 89 +++++++++++++++++++ app-misc/xmind/xmind-3.4.0.201311050558.ebuild | 102 ---------------------- 4 files changed, 107 insertions(+), 103 deletions(-) create mode 100755 app-misc/xmind/files/xmind-wrapper create mode 100644 app-misc/xmind/xmind-3.4.0.201311050558-r1.ebuild delete mode 100644 app-misc/xmind/xmind-3.4.0.201311050558.ebuild (limited to 'app-misc/xmind') 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 +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 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-r1.ebuild b/app-misc/xmind/xmind-3.4.0.201311050558-r1.ebuild new file mode 100644 index 000000000000..4c10cf065d6f --- /dev/null +++ b/app-misc/xmind/xmind-3.4.0.201311050558-r1.ebuild @@ -0,0 +1,89 @@ +# 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-r1.ebuild,v 1.1 2013/12/09 05:37:12 creffett Exp $ + +EAPI=5 + +inherit eutils multilib gnome2-utils + +MY_PN="${PN}-portable" +MY_P="${MY_PN}-${PV}" + +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" +LICENSE="EPL-1.0 LGPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=" + >=virtual/jre-1.5 + x11-libs/gtk+:2 +" + +S=${WORKDIR} + +QA_PRESTRIPPED="opt/xmind/XMind/libcairo-swt.so" +QA_FLAGS_IGNORED=" + 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() { + if use amd64; then + XDIR="XMind_Linux_64bit" + else + XDIR="XMind_Linux" + fi + 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' \ + -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 +} + +src_compile() { + : +} + +src_install() { + insinto /opt/xmind + doins -r Commons XMind || die + fperms a+rx "/opt/xmind/XMind/XMind" + + dodir /opt/bin + exeinto /opt/bin + newexe "${FILESDIR}/xmind-wrapper" xmind + + # install icons + local res + for res in 16 32 48; do + newicon -s ${res} "${WORKDIR}/xmind-icons/xmind.${res}.png" xmind.png + done + + # make desktop entry + make_desktop_entry "xmind %F" XMind xmind Office "MimeType=application/x-xmind;" +} + +pkg_preinst() { + gnome2_icon_savelist +} + +pkg_postinst() { + gnome2_icon_cache_update + elog "For audio notes support, install media-sound/lame" +} + +pkg_postrm() { + gnome2_icon_cache_update +} diff --git a/app-misc/xmind/xmind-3.4.0.201311050558.ebuild b/app-misc/xmind/xmind-3.4.0.201311050558.ebuild deleted file mode 100644 index 19cb04726ec1..000000000000 --- a/app-misc/xmind/xmind-3.4.0.201311050558.ebuild +++ /dev/null @@ -1,102 +0,0 @@ -# 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 $ - -EAPI=5 - -inherit eutils multilib fdo-mime gnome2-utils - -MY_PN="${PN}-portable" -MY_P="${MY_PN}-${PV}" - -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" -LICENSE="EPL-1.0 LGPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=" - >=virtual/jre-1.5 - x11-libs/gtk+:2 -" - -S=${WORKDIR} - -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 -" - -src_configure() { - if use amd64; then - XDIR="XMind_Linux_64bit" - else - XDIR="XMind_Linux" - fi - mv -v "$XDIR" XMind || die - mv -v 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 - 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() { - local libdir="$(get_libdir)" - dodir "/usr/${libdir}/xmind" - insinto "/usr/${libdir}/xmind" - doins -r Commons - doins -r XMind - - exeinto "/usr/${libdir}/xmind/XMind" - doexe XMind/XMind - dosym "/usr/${libdir}/xmind/XMind/XMind" /usr/bin/xmind - - # insall 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() { - gnome2_icon_savelist -} - -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 -} -- cgit v1.2.3-65-gdbad