Enable javascript support (bug 550286, Cedric Sodhi).

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x62EEF090

4 files changed, 31 insertions, 10 deletions

diff --git a/app-text/mupdf/ChangeLog b/app-text/mupdf/ChangeLog
index 6cef49095ba9..2aad53d51641 100644
--- a/app-text/mupdf/ChangeLog
+++ b/app-text/mupdf/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/mupdf
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/ChangeLog,v 1.117 2015/05/20 15:08:10 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/ChangeLog,v 1.118 2015/06/01 12:31:41 xmw Exp $
+
+  01 Jun 2015; Michael Weber <xmw@gentoo.org>
+  +files/mupdf-1.7a-system-mujs.patch, mupdf-1.7a.ebuild:
+  Enable javascript support (bug 550286, Cedric Sodhi).
 
 *mupdf-1.7a (20 May 2015)
 
diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index 1524fea143a8..a3587b5875bf 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -18,6 +18,7 @@ AUX mupdf-1.4-old-debian-files.patch 13411 SHA256 469c1d1fe0806687d26d04a7352aab
 AUX mupdf-1.5-Makerules-openssl-curl.patch 750 SHA256 5c485ac279d895afd25f2ced4a557de61182abc29ff09ef89a06718921863b10 SHA512 39d01ebd668abbbe544919f718d6ae3b150e3144e0c6dc01f36a97f5fb6e96fb6740f625a8d258cfc5a47705c9e1481c0ede782d7a817288e8052f223e456615 WHIRLPOOL 66ed76bf45f57f778fb3f39f947d936e967521b01d9f56673b8344f42d77d35be24f984467cce62e564ee2d023979722d274f5f291263b4bd29fee435438499e
 AUX mupdf-1.5-old-debian-files.patch 13387 SHA256 6a5ac18e469320f1db3ed9a3a85345421c480aa32d8fdeda35ad44253af7b67f SHA512 263862316f97aace3c8247f7f86de17aaa620fea931929b1242f92fffc2c8fc974ddcc965a5eff5c977dc5c3ba8518574ac1cacbc349d9818e24e17802b0b2d3 WHIRLPOOL e1d6bda8e1aee05bc2f9909f215116799e386759a02c6fcc267fdb1d7de294e878283e83da94c1e87df5d99b3f0edaafce6d02871a5211f9ff9d3a0a706e8824
 AUX mupdf-1.5-openjpeg-2.1.patch 455 SHA256 7b49af879df5eb2c79884a0983635fa335422edc9854bc4fbc44f653892827f2 SHA512 0a07dc0a0312ef0b6a20f6a89da7a2010008cf804a1c9b33667b17f263a69e46047a34dcb24e8015a98a61e28e1e302dc302c0fbb7303a61b00d9490146b7b83 WHIRLPOOL c971fbb370c83b2c25b180ee05149c030a67b887091d623f77e8a56b48a6eb93a586599029f16abe4355bc3ff490b266324fb8877626022d134e7f4d178057e6
+AUX mupdf-1.7a-system-mujs.patch 293 SHA256 1ca94ebf5edb50b86145dc6736a3f921eaf910cce479916c7e69785179113bb2 SHA512 600710d89cb3f6cad4a40d7dc59d0e62464e16ed6ff5b7dc75a27ca0eb0a9e3a2656862b544fb3a20a0046550d6efb12d545e442ad5dd122a7946e2943846d0b WHIRLPOOL 0e3bb5e72dfbd88489661234cedb89ccb037b1ff3c7f9d5f019b322b2926ab8f26561427b03e7984b989899177995247fbfbe04f9c299572c29eb51b316cad35
 DIST mupdf-1.1_p20121127.tar.gz 6922632 SHA256 4594bc0473e61200e6d2aba06488ea3127a7d42cd70daa01ea12c3dba5eb654c SHA512 1dff76502a5cf13e26f0bed30046878334730912ddec12f2674de69f62b173182020566f1ddd341bf3a51b28af1334c0cfcc70cac0ac8b0fb1dceacae6b25418 WHIRLPOOL 1597b87b7c53e522a5929b8c0c5c07b0a957084fb4b6974d68feea755d88606930b8a78b998efb94190c00d3d9135a60652f2751c709d49315ae10e30dc9ee0e
 DIST mupdf-1.2-source.zip 13808821 SHA256 9bc9e31ec27c091dad37f70940bd799e46ab6da4299bc58e803bff3dbb07dc3b SHA512 49261c5356d4e5648f89bfb783a23a3c3a470e044fe3b234f0906b0f6b71efad557981682e41ce3d754a5a31f1e5518e5e5f5f8dc83d2ca53181dbd3f4726e02 WHIRLPOOL 86fb60a2ac94c8ca4495c0891dd2b43ea49c9e212e2961f02914a3aaa5685566201f561c196da7d4c568dcec938eea8676959bbec839e33a7bff4e6410cc1a25
 DIST mupdf-1.3_p20140118.tar.gz 7448663 SHA256 ed1791966a60be0d8556cf5e0def0e3093867223f0eb4f12fbffd22804520882 SHA512 c159f58539f1e944608ff7da8f41cef5e955de2f21ab1e37a6fad5577134094186a8b8b7ecdf47a427547e3fde7f04f2d484da6709adf3859c3754e2774b6a56 WHIRLPOOL b24bbbd49921edcea93a80a597bb0139937ac1ef365ae63f83cf7df878586ed2a9ecbef65645b9562627fa2bc2a662991a1af1ffd99e10f10a351bccb951eebe
@@ -33,14 +34,14 @@ EBUILD mupdf-1.4-r1.ebuild 3868 SHA256 c671fef8c67125a739cf0be6e7c7408de3e044d55
 EBUILD mupdf-1.5-r1.ebuild 3994 SHA256 5a2927d239c1f6a43671dfde22c9582af6d4519b1b65c16d57b8f3d98a177ba9 SHA512 3607d22378411a6b07d18db7fee85845bf42d21dffe4ef37312ce470fe71200426b132149a2c1274f866f6db7e7c623d7098a76191b665a920e1019c028094ed WHIRLPOOL d65bb6192a8b9e27dd57e61ef5dddcba926475fdc411465d4ea04548fed947cbeefa45f1e3f651b52d3fac580d9922076de35bbc0ae8d8e3d17438ff3cdcba30
 EBUILD mupdf-1.6.ebuild 3991 SHA256 09079463c97cbfe1b8a5b67075da0239adb4ae3fd3f17e34e0aa0da1e85ba87e SHA512 ab8992565e41c9dcb5b60d273ae1bde3b22bf4ce2d691952bb9a0a03098d1d535403bbcd89874c2bba2a48796b9f85a597ced57e0f6895fb0ca75e0f144e5165 WHIRLPOOL 8f05ec8e1ad9ed46c650f8e0c73027e35fdeac7ccd57fe0db25fc196e59528b462f3ec17f4c7ffce9e8151e80ed9063886e608710bd09a17d245be5a2f7bdee7
 EBUILD mupdf-1.7.ebuild 3991 SHA256 ccd67c5b14758391c0440d61b889d1b0a2ea733ba8cdb1ab735aa30800340904 SHA512 0a48d45600c2eeabd725f7e702843e34c3bcb094b85430b927661873317dd27d9fa9770e53bf323d7c5a8f22fa3c32954a8e17ffbd046c49d00ff4b578cb8dee WHIRLPOOL dd023e6c014812d27bcab35ada37c946a1eb6079bdcde45b76dd429c034554d76e766340cdb20dce536e5a2a50694b12a78907452cd1a1c595f8a51d93386810
-EBUILD mupdf-1.7a.ebuild 3992 SHA256 7bf87ccb15822388aa9e85536baa9c82315ae4e38fc81725207aa8c36d649b5f SHA512 e73e455451049347fd82364c28a99858ac081eb65a6d9529d6c215e3ada93bba7df466205774329d33a519c7a0dd342af2759df353a65f0a187accd9b4727a7a WHIRLPOOL a6c484474226bc559fdfc571c0a20afb44766c95a3e1fd5d20cfcfd06ea044abd2363c1d8ec2a3b47a339e7baf4870ab93ef65cd5022acb920b8ef343e7dffb4
+EBUILD mupdf-1.7a.ebuild 4178 SHA256 96c9ae4eb6fdedffee44ccffb2e9d8b996324ca2d8bde5d019598deacf6af9fd SHA512 f33086c783b3763653d06a7fe6d58e4813e2c04657bdaa37d696082979ab8017511d84562a483815f3a3d36ceecb6fcc02294c01bdbd3514574e8d844133f88f WHIRLPOOL 1bd77f83b7a426a43c1eb644b61e6d2da4d0b1ccbe164588176f1c78a3e4e8ced70f4ea99328c6950b368f7e96ecd0528e9885bc2c0dbd4006f90d550c346cd4
 EBUILD mupdf-9999.ebuild 3833 SHA256 6ea4a594ce604c1a35663defe9eaf6347769bb3a40fda72429600ad61562b946 SHA512 6dd2abe94edbe41ce9e903b4344ead55362bd8d6e65e4d9d846bdf51b1766cf6e3d0bdc4b000d24bdb2d6fec4e361fd64ff2ad9ab11d1ad3da2a0c8703605df1 WHIRLPOOL c1f5ea90e8769ef7a8edd7434566672b183804911cd42a038320c2d802ff04e3e2ec018aec94075b91326276e17a31f15efb910e18def7a57412c5315610a5ba
-MISC ChangeLog 18250 SHA256 7d28ab741be19e18fcddbb3d1c3a16cefd1e83e88a2c5222ba15994b63924dba SHA512 67e74a8039719fadc65a8a57c3ef37bc07fd7abb5ec6dd9de75e46c1f2031012da58a73cfa4940b7cbe4f5a71726af5e8d4e10b71cf8b685bbe883a313984b78 WHIRLPOOL 88fdc14aaf14e758a7284fbff2b3e3c9726c30dd7eac7cb52b88be6e12eb93efe2c5d661816fbedcb55c4a7cfaf26d24394ff453c4c185ae2fd64717563e442d
+MISC ChangeLog 18411 SHA256 40d5fb05927908c2189f37ce028e8c11d089816e49735111c967fc47aaa88251 SHA512 f0bfc28bdf155187cb7a60aa36d3361b686254fd306660f51ca4b3c99479eddbfa84fe53621a2aaf94ef72eed9ea0a86aae0cb4d2d6c769efbfd8aac13386a75 WHIRLPOOL e234456101b65c5fa1681dc51f525c147b10d351f8ce94488aeab8c8734059c0eb6898b8832ecc9ef2594a9329f1b8fef51cba3dc093fa29a054f8b252f18b16
 MISC metadata.xml 302 SHA256 bde1ed5d5b77f24350d5708444153fdfc15593205bfbc58f115d2b7e292d404b SHA512 4c1b0f1ba4c185f0d80e10b094cbb41e8467308367bc6d37f51d82aba522c7d60189f3c6efa22f433d7ce25ec77ac25e9a5fdb9b00aef31c9e3fc1dd00fdbc08 WHIRLPOOL cf4814a563fd457b6e2979939fe693d765a6b87465f66ee9883c3d06723122dfe8de59e96055d7acbd8924d4d61f8627a704289e3bcc0c01a4742426780931b6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlVco1sACgkQknrdDGLu8JDALwEAiO4xDWPgH8aUNOn9JwM545cC
-PdcsHQVIPx7M5xs49ewA/1ZxZyqslOQ5/wXYCEu2fcqndJMeS9kGpFI/XprQvTcy
-=FR04
+iF4EAREIAAYFAlVsUK4ACgkQknrdDGLu8JDO8wD+Kd7EmGIHRMYsqVwgtgFAYuGj
+Etyf5sidYPWN7gxu5dQA/2yx1QLYjtLxQsLG2WdLBYMBGAeq0M4BzdV/8seuMFCa
+=ZCqu
 -----END PGP SIGNATURE-----
diff --git a/app-text/mupdf/files/mupdf-1.7a-system-mujs.patch b/app-text/mupdf/files/mupdf-1.7a-system-mujs.patch
new file mode 100644
index 000000000000..1ccaf32d79bb
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.7a-system-mujs.patch
@@ -0,0 +1,11 @@
+--- mupdf-1.7a/Makefile
++++ mupdf-1.7a/Makefile
+@@ -98,7 +98,7 @@
+ ifeq "$(HAVE_MUJS)" "yes"
+ PDF_OBJ += $(OUT)/pdf/js/pdf-js.o
+ PDF_OBJ += $(OUT)/pdf/js/pdf-jsimp-mu.o
+-THIRD_LIBS += $(MUJS_LIB)
++THIRD_LIBS +=
+ LIBS += $(MUJS_LIBS)
+ CFLAGS += $(MUJS_CFLAGS)
+ else ifeq "$(HAVE_JSCORE)" "yes"
diff --git a/app-text/mupdf/mupdf-1.7a.ebuild b/app-text/mupdf/mupdf-1.7a.ebuild
index d7f691a21d77..737f01ca6436 100644
--- a/app-text/mupdf/mupdf-1.7a.ebuild
+++ b/app-text/mupdf/mupdf-1.7a.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-1.7a.ebuild,v 1.1 2015/05/20 15:08:10 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-1.7a.ebuild,v 1.2 2015/06/01 12:31:41 xmw Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ LICENSE="AGPL-3"
 MY_SOVER=1.7
 SLOT="0/${MY_SOVER}"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="X vanilla +curl +openssl static static-libs"
+IUSE="X vanilla +curl javascript +openssl static static-libs"
 
 LIB_DEPEND="dev-libs/openssl[static-libs?]
 	media-libs/freetype:2[static-libs?]
@@ -23,7 +23,8 @@ LIB_DEPEND="dev-libs/openssl[static-libs?]
 	net-misc/curl[static-libs?]
 	virtual/jpeg[static-libs?]
 	X? ( x11-libs/libX11[static-libs?]
-		x11-libs/libXext[static-libs?] )"
+		x11-libs/libXext[static-libs?] )
+	javascript? ( dev-lang/mujs )"
 RDEPEND="${LIB_DEPEND}"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
@@ -41,7 +42,8 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-1.3-CFLAGS.patch \
 		"${FILESDIR}"/${PN}-1.5-old-debian-files.patch \
 		"${FILESDIR}"/${PN}-1.3-pkg-config.patch \
-		"${FILESDIR}"/${PN}-1.5-Makerules-openssl-curl.patch
+		"${FILESDIR}"/${PN}-1.5-Makerules-openssl-curl.patch \
+		"${FILESDIR}"/${PN}-1.7a-system-mujs.patch
 
 	if has_version ">=media-libs/openjpeg-2.1:2" ; then
 		epatch \
@@ -71,6 +73,9 @@ src_prepare() {
 	    -e "1iHAVE_X11 = $(usex X)" \
 		-e "1iWANT_OPENSSL = $(usex openssl)" \
 		-e "1iWANT_CURL = $(usex curl)" \
+		-e "1iHAVE_MUJS = $(usex javascript)" \
+		-e "1iMUJS_LIBS = -lmujs" \
+		-e "1iMUJS_CFLAGS =" \
 		-i Makerules || die
 
 	if use static-libs || use static ; then