Version bump. Add patch to fix exporting to PNG (bug #468888). Add custom launcher to support firefox-bin (bug #468142).

Package-Manager: portage-2.1.12.4/cvs/Linux x86_64
Manifest-Sign-Key: 0x675D0D2C

5 files changed, 94 insertions, 11 deletions

diff --git a/media-gfx/evoluspencil/ChangeLog b/media-gfx/evoluspencil/ChangeLog
index 8471bd788dda..adad4cd59e7d 100644
--- a/media-gfx/evoluspencil/ChangeLog
+++ b/media-gfx/evoluspencil/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-gfx/evoluspencil
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/evoluspencil/ChangeLog,v 1.2 2013/02/03 02:51:03 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/evoluspencil/ChangeLog,v 1.3 2013/06/13 11:13:23 kensington Exp $
+
+*evoluspencil-2.0.4 (13 Jun 2013)
+
+  13 Jun 2013; Michael Palimaka <kensington@gentoo.org>
+  +evoluspencil-2.0.4.ebuild, +files/evoluspencil-2.0.4-exportpng.patch,
+  +files/launcher:
+  Version bump. Add patch to fix exporting to PNG (bug #468888). Add custom
+  launcher to support firefox-bin (bug #468142).
 
   03 Feb 2013; Jeff Horelick <jdhore@gentoo.org> evoluspencil-2.0.3.ebuild:
   Marked ~x86 wrt bug #454494
diff --git a/media-gfx/evoluspencil/Manifest b/media-gfx/evoluspencil/Manifest
index a6a49495f4d0..5cf341d7128e 100644
--- a/media-gfx/evoluspencil/Manifest
+++ b/media-gfx/evoluspencil/Manifest
@@ -1,18 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
+AUX evoluspencil-2.0.4-exportpng.patch 547 SHA256 2a64a07f31fefd4ed06a542ec174fc4cf2efc7c83a0cd8b819ec94db49b6d2a3 SHA512 e2d88ceabcc73190b2c3424fce7bf998df7e5e1b5ebbdc308edd361859cf993df7de284b781ba2cd05e863205f0a210ff68c1fdc70cb4f87e59ac10af9a03353 WHIRLPOOL fcdc8c1f973e009481bcf73a9cc6f93a275c2f117d1edbbad8a28467084e673689946f33cd5d4710533204d7b5cdeb15ace2300401aa293d0b473ba8efcf4c4e
+AUX launcher 324 SHA256 16608d41dd0314982c8b4355da7fcfa8fccb86cb012256cb54bfb42d28020749 SHA512 4266eca92c9860a5bd73d14e3650729bf93e2b14525dfe6d7b36009273561404440395e3d494b924fc2f76372a97a17ee40f5e375f70157174783812b272fb72 WHIRLPOOL 9086d5ea9e67c5ae9c556a50d2cf812b57515b392135646de34176b5fa7b79d465426e4353049057c12cd102ca29210b01b56e9435faf53783e98d1a2599d808
 DIST pencil-2.0.3.tar.gz 4820625 SHA256 591f19706d355915728b75337f50ffb7aabdee84a8f68fd09102fbb5bf60dff4 SHA512 ad549ccf1eb8dd7b2c6de176ccae8fe48ec8cb084c7f55d29852e2fb76f571c679b5e864579915efe7c4e84e3d870df408e150707b3eb0cef6ad5d1cb1cdeae2 WHIRLPOOL 3fc6305d2370f3d526e6819d3c1748bc1a11d1cb1bb7fb5d37bd4785f031a5334b00e092bf76387b50bb64b012722c6d01532f8b2347568788ddcecd8ee08ef7
+DIST pencil-2.0.4.tar.gz 4810253 SHA256 89df638945a0187704f6e43cb5b74577a62ba7c4243dde6540af526a83f6fca8 SHA512 f4125195525b349bea03e6e79659cb0cb4591de1bb28e997b9d8f8d81e2e05d4e5b480810b7ed476a3a98d0c35042d111f0c3d51ce260667f8dac9790077db20 WHIRLPOOL 3ba97a9ce92138ca980302e48aa7ec409e7ea230e586927a2080d442d5b68c8af3c7f2a394de33a86d1fa4b7c9c68de05902c4525863c34c887963d7f9c40402
 EBUILD evoluspencil-2.0.3.ebuild 1083 SHA256 15e47c4796e5a89c74e2a480b35538d8472c887efc911c12dd314b2dc35dd084 SHA512 8a3cfba481de78cdd3fcba1a11a26c391302907a48868b33d90e9d8fca547f7699a7af5f05aee9f571bfa59a7c89c0f540d482f13a692bfcd54761bceba6a54f WHIRLPOOL 6a6d6046a7ec60521b198cb30a9d10d2eef1a4111a351d0e2729520a1daedc3ecfe08fca0feacbb28f7716df78ff731807ee8d340b0c4e5eb4e98878d8b17b6b
-MISC ChangeLog 491 SHA256 173fb1c28806daf05310e3f0a301727e92dc0b17300b820534479ae9fb443696 SHA512 85164430c755d18551830efc7519f44dcda757759cb483b15f82b16bae260b1c227445099197be543422c79cc617535491290cb320274a2711518288fe5bdf64 WHIRLPOOL e47cd0dcc77e85b53c700c6eb6cc5508cb8177dd90a912bde2ba5cac1623d6eaaba265447fb17718a878a1106fdb83d31b7f41c67b37b7913477f16358dcc537
+EBUILD evoluspencil-2.0.4.ebuild 1093 SHA256 3f41b370e240fc410f5afaa15a38db09969984108726a2ad6c8f21118c15c11e SHA512 81482eedef25aea3dd77c944b098ac36f132c49c10f126934286a1f0a2111bd61a1396c7692ce0abe46b5169fe956a47ac7b154d06cfa3c8878e849f322a9703 WHIRLPOOL 4d8fd50eeb0ed7b3e4f0bb9d2f097857b57484f399f7f2737d2b69a6163047bfc855a371c9a65b9fe07c8de7b3d26595b7d35e26bc3d503b10d1d28e0e528757
+MISC ChangeLog 804 SHA256 892d39b5148a49393f200b7ac4465b6cf6ca37606da7e881b3864914a80ea975 SHA512 d1a770ca886c513ba305a8640c362183ec9c626aed1e3580fff6183147a176a38edf5ad47864ece93715a4be80f8921da577566157a2199cae2b9d676fb54be1 WHIRLPOOL ebdbed728d8dfdbf82183536f997ec6472386d6c85b725948cc706c7cb4221508106bdd7c48a0f8237bbaabecb529b74385d7a538a764a97c2f70db8b1694537
 MISC metadata.xml 289 SHA256 3fd1433b675ec7b4b61d2c0cbf610d50782e55ddd13ad6c5cdebf5dc3aeb847b SHA512 e86376c33dea02fcb0f2f0c38ef320ecda8788bc14452af7c4c104fcef3e4d014e9bf7af8e8316956485393b773288da44e89d4426c8955a7bce0387b8011342 WHIRLPOOL 15f81dc1a0322823aca871a952c2e5a17f26e18142408979b829fac72e16c1eaa78b7a29b0108a466665c522671e355d54e95f1acf6147f508c580616b209e8f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCgAGBQJRDdCYAAoJEPUd7O0j6ekAYQQH/iP7Qg6fJfY3eA2LjH7vn+Y7
-kOcNCn5rYHlY2n/7qE/38LX052bU8dhHhDWsEbeHOq9MVDbyY+EGXxKjnS/vfRHV
-cEJuU1NU9y1WIUsV0sSJqo0TRVsgbMBAZUr0ONKPIgba+KQ5RTR+z13ipQWfEgRD
-AuZMiCKVaoKv5D6SBYjqBK7C4MVRFvakqjkZtMB03CC+kAXzQJ83sOI78LducAj8
-0dPsIwDT9WsPDQK7HNk8/zp8UYOEfu5HjVgMu4H6AwpasMev65ncuqV44OfQGC9N
-6jJa0jIHda4EtiJYWhMXJ7egaAmpRGOmuyKf/IsaxXfbTPHPqYCfhCpOcTI4/2k=
-=fNRH
+iQEcBAEBCAAGBQJRuaj9AAoJEMbwO6tnXQ0skh8IAMIRic6+j3CozWJQ8L3J566k
+U2JT461TiL+NAqbaHOkAtpshVsZxa7I/JKYWgWVwFunHl579HqvpHX3d/31dp2wQ
+25NqNL+zlePnrc5YYfE1BTuu7tKzLpL4pupKXVT/6HlI94fS1upTwdNXoebvgZYi
+k2F8J1wagCrKz1FSNsgPob+pLREDCGYnJdcCjXNeuzDNCYagarRVB8PHbzj5BP9T
+UZW8DzGc+tvxvQrygQjd8d6QFYn8PPfF0hPjExg8ysD6OW/aflt5fNFB6D7kuKCE
+SbJAGCWYLZIwei97wgKd56SqvxxtQ+UZ5t0bH1+lvrQlvst2dj+cDmkAnes19oU=
+=MB2b
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/evoluspencil/evoluspencil-2.0.4.ebuild b/media-gfx/evoluspencil/evoluspencil-2.0.4.ebuild
new file mode 100644
index 000000000000..5dcbbf221314
--- /dev/null
+++ b/media-gfx/evoluspencil/evoluspencil-2.0.4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/evoluspencil/evoluspencil-2.0.4.ebuild,v 1.1 2013/06/13 11:13:23 kensington Exp $
+
+EAPI=5
+MY_P="pencil-${PV}"
+
+inherit eutils fdo-mime
+
+DESCRIPTION="A simple GUI prototyping tool to create mockups."
+HOMEPAGE="http://pencil.evolus.vn/"
+SRC_URI="http://${PN}.googlecode.com/files/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="|| ( www-client/firefox www-client/firefox-bin )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-exportpng.patch
+
+	# avoid file collisions with media-gfx/pencil
+	mv usr/bin/{pencil,${PN}} || die
+	mv usr/share/{pencil,${PN}} || die
+	mv usr/share/applications/{pencil,${PN}}.desktop || die
+
+	sed -e "s/pencil/${PN}/" -i usr/bin/${PN} \
+		-i usr/share/applications/${PN}.desktop || die
+}
+
+src_install() {
+	doins -r usr
+	newbin "${FILESDIR}"/launcher ${PN}
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
diff --git a/media-gfx/evoluspencil/files/evoluspencil-2.0.4-exportpng.patch b/media-gfx/evoluspencil/files/evoluspencil-2.0.4-exportpng.patch
new file mode 100644
index 000000000000..dd5febcac3b5
--- /dev/null
+++ b/media-gfx/evoluspencil/files/evoluspencil-2.0.4-exportpng.patch
@@ -0,0 +1,16 @@
+Fix exporting to PNG.
+
+Upstream bug: https://code.google.com/p/evoluspencil/issues/detail?id=545
+Gentoo bug #468888
+
+--- usr/share/pencil/content/pencil/common/svgRasterizer.js
++++ usr/share/pencil/content/pencil/common/svgRasterizer.js
+@@ -261,7 +261,7 @@
+               createInstance(Components.interfaces.nsIWebBrowserPersist);
+ 
+     persist.progressListener = persistListener;
+-    persist.saveURI(uri, null, null, null, null, localFile);
++    persist.saveURI(uri, null, null, null, null, localFile, null);
+     //persist.cancelSave();
+ }
+ 
diff --git a/media-gfx/evoluspencil/files/launcher b/media-gfx/evoluspencil/files/launcher
new file mode 100644
index 000000000000..4ac04e8c8c82
--- /dev/null
+++ b/media-gfx/evoluspencil/files/launcher
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+if [ -x /usr/bin/firefox ] ; then
+        /usr/bin/firefox --app "/usr/share/evoluspencil/application.ini"
+elif [ -x /usr/bin/firefox-bin ] ; then
+        /usr/bin/firefox-bin --app "/usr/share/evoluspencil/application.ini"
+else
+        echo Could not execute required /usr/bin/firefox or /usr/bin/firefox-bin
+fi