Update to new file structure and second shared lib. Add XF86XK_Forward and XF86XK_Back keys for Linux.

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

8 files changed, 80 insertions, 51 deletions

diff --git a/app-text/mupdf/ChangeLog b/app-text/mupdf/ChangeLog
index b222e3c2f801..173b6f99ce28 100644
--- a/app-text/mupdf/ChangeLog
+++ b/app-text/mupdf/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/mupdf
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/ChangeLog,v 1.78 2013/06/20 09:11:08 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/ChangeLog,v 1.79 2013/06/20 22:46:53 xmw Exp $
+
+  20 Jun 2013; Michael Weber <xmw@gentoo.org> +files/mupdf-9999-CFLAGS.patch,
+  +files/mupdf-9999-forward_back.patch, +files/mupdf-9999-zoom-2.patch,
+  -files/mupdf-9999-buildsystem.patch, -files/mupdf-9999-install-headers.patch,
+  files/mupdf-9999-pkg-config.patch, mupdf-9999.ebuild:
+  Update to new file structure and second shared lib. Add XF86XK_Forward and
+  XF86XK_Back keys for Linux.
 
   20 Jun 2013; Michael Weber <xmw@gentoo.org>
   +files/mupdf-9999-install-headers.patch, mupdf-9999.ebuild:
diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index 3156467053c3..e3395e81df7f 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -8,10 +8,11 @@ AUX mupdf-1.1_rc1-buildsystem.patch 521 SHA256 b98072f9fab9a687fddd2ba13a0883646
 AUX mupdf-1.1_rc1-zoom-2.patch 200 SHA256 c0b9d6bbe627dc12492bf91d2e742a9801580eec69c137f6474a3791b5d94191 SHA512 793ba40424a41aec2c758b7f1ae433fa2ff118f72b984b914ae3ea1734faec4d281ff59d2821ecdb077037afd0e2f5482305fe4b4102c810e602792f766271f8 WHIRLPOOL 52c5d18389f1fc9f5441d0a0f8bf6d152a4e6ef7ccd99b76d8b638a22ce967405b237373437f9297239256aaf89250217217296e5d2ed3ee3b06e46e21cdcaf1
 AUX mupdf-1.2-mubusy_rename_fix.patch 621 SHA256 63b2c440da458c470b276fa59271c6d2fe58b1f254937e621be4580ce16b2ad6 SHA512 7b9d3d8c10bc09bc2b755cc7d27fba8b78bbf7eaf83c93f76f31bb214a61346eca92469f0f1c8ae9ea2b15354fd280b6b0b478175928daa66c84fb4927d805f2 WHIRLPOOL c659fa6e5e29aae26b29e58d96acbe975c2dc847c6819d5648853505d64967f4b6c15b26156652ad5689dfa821f2a9f0a0f0130f686334c8df853dd3705335e1
 AUX mupdf-1.2-pkg-config.patch 504 SHA256 1636b9ed8fa48609298a785625c14c1a9e03f10f2f4c1a502d963f4a05c14612 SHA512 3d49d9734e7390ce47a8313262e1b70b8a95552e6f3b4a9cd7a3e00b265c75d3eda8cc3c2013e379127206737f7d6520bfba7dedfe4103a8e652d4b3b713d3a1 WHIRLPOOL 6f190f196c465e801c7ec019fbdbedece4549d7f00d39c0946836ad22efd80c4702eab85e046792fa75952e83774316534007e387dbc77b4755cc8b9132bbe51
-AUX mupdf-9999-buildsystem.patch 251 SHA256 c2fc5eb9e09527385dd73ced61bf4e5ce0102ee0fac71d64165b582c086c1f21 SHA512 6563e8e28e713e605c1b180903c1097e54d7e35780e0f6b08d7ff86420d707a21ac59262bd34fd69f5fb458d34fb346f2e0f8fcc15bbcfb20199d3d34162a423 WHIRLPOOL 55c3035f21fbf484db631e4db09590611c134540db1859206c8b3930009ac57492a77056dd9b4134244434b334a56024cb1ac9c24bbc22205ab1a361d1482040
-AUX mupdf-9999-install-headers.patch 909 SHA256 d0032400017bf43fff76c666c1cedcc3777ee995df79fe7367212b88875ea8b6 SHA512 247025d9bf3445d53af8647969dcabbcfc198427dfbe0533e257788414a76b9c872ce0a0956f583827e2ef68a41a0b87c450ad989c2f0342b442f47fcecae6fc WHIRLPOOL f51eb2538b7fc90413f77ab805e9eb2206669a6b89f6ba7091582c9f189c9c98adab814ffa79bd17e22dfed6bb8e7f1df07e3ff818f980d9513a9fa9761bb4ec
+AUX mupdf-9999-CFLAGS.patch 251 SHA256 c2fc5eb9e09527385dd73ced61bf4e5ce0102ee0fac71d64165b582c086c1f21 SHA512 6563e8e28e713e605c1b180903c1097e54d7e35780e0f6b08d7ff86420d707a21ac59262bd34fd69f5fb458d34fb346f2e0f8fcc15bbcfb20199d3d34162a423 WHIRLPOOL 55c3035f21fbf484db631e4db09590611c134540db1859206c8b3930009ac57492a77056dd9b4134244434b334a56024cb1ac9c24bbc22205ab1a361d1482040
+AUX mupdf-9999-forward_back.patch 612 SHA256 e0ac626c00a21c607c158ed215fb8185dd01500af79727f48660170e761815d7 SHA512 42fec7eb1e5aa171ad6f7d8f1984a1804287fb1ad54bed7bcd0e3df6493955873ba376eeaf2ebd428d7cee2d1327d56002e3717ff8a7a74ea00ece51f9ab943f WHIRLPOOL 6246bf21953ea91f279240f86e98979b0f2d3ec5eafcb5c385d65172df10e91bcfac3f99d151afa7b594c540291b57d4e12d0642b4f7ee4bf9406071b111183a
 AUX mupdf-9999-openjpeg2.patch 567 SHA256 64f0d8946d0fe037a95fd5a58b4622c913622f930b21dd6af39f030d282141e9 SHA512 0a43bc4eadf41bd0bf6a6f0e400d0cc0eb701575ac7fb44c271aa5f298071bfcd7b3c5d83709782c0c935721a27470c58cefd2b385178c2b121b620061a070f5 WHIRLPOOL 76e2a7d1146d8bf55819e0588863a9b21c2272566820d90c3779de00f33b9863995d2b1cab6804be2f42579bf1fa874a78e9380f575aa50461f2908dda3761b6
-AUX mupdf-9999-pkg-config.patch 519 SHA256 8cce601a801c90ef967588942238e0c7210ecaea76c22721ee2ad32667e1b396 SHA512 6de4e8b32841bef8cfb04a75453e14d573e98f61f6ab0f03b637208b8f1498a362619144bf2ddc72aec05d27bc7696178814c3354bb149e9505d38fc757b1a49 WHIRLPOOL d93000505a85e78cb1c2040d1ec3171cd6f65dbe4dac055dd2f8b32fe5b6cae2f28dd914e711e6f6091060bc9c06cfbb9a74c1554f4638d904d6673671860848
+AUX mupdf-9999-pkg-config.patch 568 SHA256 409432fd7021cc353e0b72fdda891d0d0f0f7508f8514e735a2d9c7884199ebe SHA512 1ad447d5d6468a920cf71b3e12bce1862894734522b5c0e5f87871799b239582f56eca08d69b5d1b366369dda6f93037136dff07126398d2b7a746406a9fdc0e WHIRLPOOL 6f0df1978cf4ed97a92b6e681e5bbdd888e55a86ceb6b538a6269df0474d090de7c7ba924090eebee271261d2db237593f5ba226f1851a2a6830a9f50fc7f9f0
+AUX mupdf-9999-zoom-2.patch 216 SHA256 239f60b41a1afde0f01095c5d5052503491593887cb2338f201889ea0a1ef814 SHA512 caccead68c45f06b5f209330040d4afdb51da2506d5692f27c93ad96577d4f16fad27fc9a66097f09326d65225a3e2fe9206eef8698fb549d83c5a93a57fb396 WHIRLPOOL b8fac668373049887f06248800f39a239a133b905969ca1972bf4c6cb9529570a1df5b5816a367ad74dd3cdb49b59abff15d386524a65305564454fbfa48a8ae
 DIST mupdf-1.0-source.tar.gz 4208530 SHA256 4f5e12625f7f827f6eb5606026c9a7a7dbdeaf935fcea3bc173ed8d469698ec2 SHA512 00f71288740a137fa3eb3537453f0465949a2dbc590a38651b3dd7a651dad6d0dc5070a3072988439f52729b12478cb467f202157ceb44e5a560431354567861 WHIRLPOOL b58166c37fa6ba81e946e53326dad50426886380b051943f2988657780e3c77e4970541f27ec3efc29ce6693012293bf3104dfd79dfc50f644c6f051431294f3
 DIST mupdf-1.1-source.tar.gz 4281735 SHA256 e54666bbe1d9f0a5464349bfbeffcf676c4a0fcad3efb89eba1f20d4ac991f34 SHA512 d61694041d28309e8119283fb97cef5e1f2effa6e93bfe5ad0b2a0b6b76e38a575a23b0ba367cb59efa77f35b131bf82667f2c7c8df29eb4cdbe3c12b0ad3a33 WHIRLPOOL 67ba7df6c0b94f3213b2e6a709fc3d9ec02945a0825169fb8833b2919b4bd4d8e6fd5f29b2b231df213f8e68d092526b59c152281b56d1c3a9064799ed35e60c
 DIST mupdf-1.1_p20121127.tar.gz 6922632 SHA256 4594bc0473e61200e6d2aba06488ea3127a7d42cd70daa01ea12c3dba5eb654c SHA512 1dff76502a5cf13e26f0bed30046878334730912ddec12f2674de69f62b173182020566f1ddd341bf3a51b28af1334c0cfcc70cac0ac8b0fb1dceacae6b25418 WHIRLPOOL 1597b87b7c53e522a5929b8c0c5c07b0a957084fb4b6974d68feea755d88606930b8a78b998efb94190c00d3d9135a60652f2751c709d49315ae10e30dc9ee0e
@@ -20,13 +21,13 @@ EBUILD mupdf-1.0.ebuild 1515 SHA256 3b298f1cfe6a01d665a14062604e40bbc823fee8df6e
 EBUILD mupdf-1.1.ebuild 1553 SHA256 5957e8e39a40c7bd80c60cc8964dc8cd6f77f5a61e9fe7aa498ea13839a2644e SHA512 494ddc8b2fabb2ba0ac2d12432e22162ecec37b1a4167994f15ffbee4fa8a2460993450591843e6bfdd319673109dd77cd4d02453575e5d0df01c2161e465565 WHIRLPOOL e0c33e733a33723c3ac91b45f001e2afe323260a235435a2a36783fb4c9eb8c5ae98895938bff3a6bd506346efdc582fd8e5575e84f133e733bf12bade4eaecd
 EBUILD mupdf-1.1_p20121127.ebuild 1488 SHA256 4e11b767db4d78de3d5b7e83ca1ec97880c30375249db419265100366fd20585 SHA512 fdbe754cf384c594f754a31e3d5153f25fc43966fc359f999e2852eb3eefbe13d1ca03a022dfbfd0a649a1b1a4f6d84fd5232005a5203ead16768eb12fa32f90 WHIRLPOOL 7b1e8e8b2b2c5209a5cd81de3bc70d0dae0d905d12006800618b1ac31212fe5b2bb0aef6a7e6dd8151052f1d56a1437d0687b10e635ddf2529e35eb9daedb6b8
 EBUILD mupdf-1.2.ebuild 3255 SHA256 cf06222b309c3911f41eeeeb42b50a83925aed7aeca8daa8a1edd6476a65f79f SHA512 32efb0f3a5c132bc4a06715caf3e03b1a4bd3eaeea44d09a14052c1bc39dfaabb871bb02aa79c09825bf6939315c7c58a582e761468a474a15ec53ce6f1120c7 WHIRLPOOL d26a23df3b02708151c3d9a3f1d7ba9f4c1a30250a2ceccfa633b58499fda18e87daa45fd9d7573d505a61125cccaa0ae70376e28b1fb6615dde9033cf175bf2
-EBUILD mupdf-9999.ebuild 3250 SHA256 453d23fe7e1b6d0607e1e24e09ab326f90f6d214259cf990be2a6433b67b9bb6 SHA512 aad0bb3a7fece2b7a4ceeb250118a9ec387a28e40dea1058b11794894b03fbd2893343d41e15b0d965903b58b7f35b007eb12c9a6ca2e37f914ab91d9acc1a45 WHIRLPOOL f0a09317287a424be4c870da509a9bf7bd06da3741a3f344206eb99a9a055a77d582eb7f0978bcef16c0675153cb80dffa0d4647a54806a66f8a8af6352d03d0
-MISC ChangeLog 12281 SHA256 5bff09e15a2613463e1e57ca2c138e8149d7051e37f11e0eb754f6039c5c4364 SHA512 1d977f30d0df375371eaa687e514b93b58fea99e62752be753711127b6a9ac4e94c3e2da3c69a7da9013b144a3f9f22fcf0dc919a3de00ee47e84145e8344d88 WHIRLPOOL a2bfdc01a57d9f7d1b21dc299bc1c8c5ac8835d12068a851243ece3a812752895072928916e52ecb5ae4772ccfdc22c136231564fd24b1f281901c5ce803910f
+EBUILD mupdf-9999.ebuild 3593 SHA256 c890e59015dc69aa65c6e9990c52f8b5c6242b6c2ab85500ebc525d8721eb96f SHA512 471bd79795a18a5bc76e9c739352712f0052fee8c2ba9dd32f16c6426ae97a6a88280c7f47bc2400d611a13041cc5c17a96179f6265f1cf859717cca1fabf712 WHIRLPOOL f5b8c203439d133e69eda8f2099764e663af5bc1548e73232e95fb67ddb87b3089a666d35ac80628d8e5c2f628c41f9e72e80c51c46a85e01d62018c2380a13c
+MISC ChangeLog 12675 SHA256 75e1143d650f22bfe6b96579de2c2830b0009f12764f15594686e113234e5844 SHA512 69cfd7eeef505704504ca8a55e05ad4d995c13e68f72ffe65e1fc7b1435ec0a73a552bea740a49966abc67b5ed0e9e4734181c60582f0eea04e96a0e3a3e71fc WHIRLPOOL ceb587da2cf4dfd4e1a0bdcf1d6683b44328b5327f22047ba8b506ed865a2b8e1254ae0b768f1b692087edcb09e203878e8efddf6942b1a237908c25944106da
 MISC metadata.xml 224 SHA256 f810c6de744adceee241992d3f713142db3e7025986f6cc5898cfe3c9cb2f4a7 SHA512 4f78d959809ec0db2f9be2a7747d572fa8ee03d177044dd46574881a6ee83736510b76062c12daecae609282d197ba466e8a3e3a654b1383e04c659acd41bef5 WHIRLPOOL 0300a228d371c918b051bc24859dfe4e5d0d2a71b80f697f202749c5aca69efcee4be6e69454c9abfa4ced28e19a9d1f71d6d7eaf54290b8d03b5c04fd209868
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iF4EAREIAAYFAlHCxyoACgkQknrdDGLu8JBgDAD/Zz22IYBEmUQsSV5w4pnuuIhi
-f7qmpciDyekecHxZxDwA/jIUoJeHfStMT87OO9rxjwrYJPz3JC6nH30eaw0M5REI
-=tU81
+iF4EAREIAAYFAlHDhlsACgkQknrdDGLu8JDEngD/WF8UKTOkb7bRSj4LIt8Ygfkl
+R3pKbSHg5AWEm+4KCzcA/3EaeXuefq/G+RiRTnE5n6bQ+ICVNfaouV0StY+VdZ0t
+=InkQ
 -----END PGP SIGNATURE-----
diff --git a/app-text/mupdf/files/mupdf-9999-buildsystem.patch b/app-text/mupdf/files/mupdf-9999-CFLAGS.patch
index 487c2128d12f..487c2128d12f 100644
--- a/app-text/mupdf/files/mupdf-9999-buildsystem.patch
+++ b/app-text/mupdf/files/mupdf-9999-CFLAGS.patch
diff --git a/app-text/mupdf/files/mupdf-9999-forward_back.patch b/app-text/mupdf/files/mupdf-9999-forward_back.patch
new file mode 100644
index 000000000000..35c6f1df1594
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-9999-forward_back.patch
@@ -0,0 +1,25 @@
+Add F86XK_Forward and XF86XK_Back for page switch by muhpdf@binkmail.com 
+on http://bugs.ghostscript.com/show_bug.cgi?id=693494
+
+--- mupdf-9999/platform/x11/x11_main.c
++++ mupdf-9999/platform/x11/x11_main.c
+@@ -5,6 +5,7 @@
+ #include <X11/Xatom.h>
+ #include <X11/cursorfont.h>
+ #include <X11/keysym.h>
++#include <X11/XF86keysym.h>
+ 
+ #include <sys/select.h>
+ #include <sys/time.h>
+@@ -836,9 +837,11 @@
+ 						break;
+ 
+ 					case XK_Page_Up:
++					case XF86XK_Back:
+ 						len = 1; buf[0] = ',';
+ 						break;
+ 					case XK_Page_Down:
++					case XF86XK_Forward:
+ 						len = 1; buf[0] = '.';
+ 						break;
+ 					}
diff --git a/app-text/mupdf/files/mupdf-9999-install-headers.patch b/app-text/mupdf/files/mupdf-9999-install-headers.patch
deleted file mode 100644
index 7c91abc9f2f9..000000000000
--- a/app-text/mupdf/files/mupdf-9999-install-headers.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-based on http://bugs.ghostscript.com/show_bug.cgi?id=694365&list_id=6717
-
---- mupdf-9999/Makefile
-+++ mupdf-9999/Makefile
-@@ -248,9 +248,12 @@
- mandir ?= $(prefix)/share/man
- 
- install: $(MUPDF_LIB) $(MUVIEW) $(MUDRAW) $(MUTOOL)
--	install -d $(DESTDIR)$(bindir) $(DESTDIR)$(libdir) $(DESTDIR)$(incdir) $(DESTDIR)$(mandir)/man1
-+	install -d $(DESTDIR)$(bindir) $(DESTDIR)$(libdir) $(DESTDIR)$(mandir)/man1
-+	install -d $(DESTDIR)$(incdir)/mupdf/{fitz,pdf}
- 	install $(MUPDF_LIB) $(DESTDIR)$(libdir)
--	install fitz/memento.h fitz/fitz.h pdf/mupdf.h xps/muxps.h cbz/mucbz.h image/muimage.h $(DESTDIR)$(incdir)
-+	install include/mupdf/*.h $(DESTDIR)$(incdir)/mupdf
-+	install include/mupdf/fitz/*.h $(DESTDIR)$(incdir)/mupdf/fitz
-+	install include/mupdf/pdf/*.h $(DESTDIR)$(incdir)/mupdf/pdf
- 	install $(MUVIEW) $(MUDRAW) $(MUTOOL) $(DESTDIR)$(bindir)
- 	install $(wildcard apps/man/*.1) $(DESTDIR)$(mandir)/man1
- 
diff --git a/app-text/mupdf/files/mupdf-9999-pkg-config.patch b/app-text/mupdf/files/mupdf-9999-pkg-config.patch
index 77d9533bc504..f0ccfb3e60ff 100644
--- a/app-text/mupdf/files/mupdf-9999-pkg-config.patch
+++ b/app-text/mupdf/files/mupdf-9999-pkg-config.patch
@@ -4,9 +4,9 @@ http://bugs.ghostscript.com/show_bug.cgi?id=694301
 openjpeg-2
 http://bugs.ghostscript.com/show_bug.cgi?id=693518
 
---- mupdf-9999/debian/mupdf.pc
-+++ mupdf-9999/debian/mupdf.pc
-@@ -4,9 +4,8 @@
+--- mupdf-9999/platform/debian/mupdf.pc
++++ mupdf-9999/platform/debian/mupdf.pc
+@@ -4,9 +4,9 @@
  includedir=${prefix}/include
  
  Name: mupdf
@@ -16,4 +16,5 @@ http://bugs.ghostscript.com/show_bug.cgi?id=693518
  Version: 0.5.0
  Libs: -L${libdir} -lmupdf
 -Libs.private: -lopenjpeg -ljbig2dec -ljpeg -lz -lm
++Libs.private: -lmupdf-js-none
  Cflags: -I${includedir}
diff --git a/app-text/mupdf/files/mupdf-9999-zoom-2.patch b/app-text/mupdf/files/mupdf-9999-zoom-2.patch
new file mode 100644
index 000000000000..2c9c8c9fd874
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-9999-zoom-2.patch
@@ -0,0 +1,10 @@
+--- mupdf-9999/platform/x11/pdfapp.c
++++ mupdf-9999/platform/x11/pdfapp.c
+@@ -866,6 +867,7 @@
+ 		break;
+ 
+ 	case ' ':
++	case 'F':
+ 		panto = DONT_PAN;
+ 		if (app->numberlen > 0)
+ 			app->pageno += atoi(app->number);
diff --git a/app-text/mupdf/mupdf-9999.ebuild b/app-text/mupdf/mupdf-9999.ebuild
index 78c8004d1d4e..f6f1be148afe 100644
--- a/app-text/mupdf/mupdf-9999.ebuild
+++ b/app-text/mupdf/mupdf-9999.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-text/mupdf/mupdf-9999.ebuild,v 1.36 2013/06/20 09:11:08 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-9999.ebuild,v 1.37 2013/06/20 22:46:53 xmw Exp $
 
 EAPI=5
 
@@ -36,22 +36,25 @@ DEPEND="${RDEPEND}
 src_prepare() {
 	rm -rf thirdparty || die
 
+	[ -f source/fitz/draw-scale-simple.c ] && \
+		rm -f source/fitz/draw-scale.c
+
 	epatch \
-		"${FILESDIR}"/${P}-buildsystem.patch \
+		"${FILESDIR}"/${P}-CFLAGS.patch \
 		"${FILESDIR}"/${P}-openjpeg2.patch \
-		"${FILESDIR}"/${P}-pkg-config.patch \
-		"${FILESDIR}"/${P}-install-headers.patch
+		"${FILESDIR}"/${P}-pkg-config.patch
 
 	sed -e "/^libdir=/s:/lib:/$(get_libdir):" \
 		-e "/^prefix=/s:=.*:=${EROOR}/usr:" \
-		-i debian/mupdf.pc || die
+		-i platform/debian/mupdf.pc || die
 
 	use vanilla || epatch \
-		"${FILESDIR}"/${PN}-1.1_rc1-zoom-2.patch
+		"${FILESDIR}"/${P}-zoom-2.patch \
+		"${FILESDIR}"/${P}-forward_back.patch
 
 	#http://bugs.ghostscript.com/show_bug.cgi?id=693467
 	sed -e '/^Actions=/s:=.*:=View;:' \
-		-i debian/${PN}.desktop || die
+		-i platform/debian/${PN}.desktop || die
 
 	sed -e "\$aOS = Linux" \
 		-e "\$aCC = $(tc-getCC)" \
@@ -78,43 +81,44 @@ src_prepare() {
 	fi
 
 	my_soname=libmupdf.so.1.2
-	sed -e "\$a\$(MUPDF_LIB):" \
-		-e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname} -Wl,--no-undefined -o \$@ \$^ \$(LIBS)" \
-		-e "/^MUPDF_LIB :=/s:=.*:= build/debug/${my_soname}:" \
+	my_soname_js_none=libmupdf-js-none.so.1.2
+	sed -e "\$a\$(MUPDF_LIB): \$(MUPDF_JS_NONE_LIB)" \
+		-e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname} -Wl,--no-undefined -o \$@ \$^ \$(MUPDF_JS_NONE_LIB) \$(LIBS)" \
+		-e "/^MUPDF_LIB :=/s:=.*:= \$(OUT)/${my_soname}:" \
+		-e "\$a\$(MUPDF_JS_NONE_LIB):" \
+		-e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname_js_none} -Wl,--no-undefined -o \$@ \$^ \$(LIBS)" \
+		-e "/^MUPDF_JS_NONE_LIB :=/s:=.*:= \$(OUT)/${my_soname_js_none}:" \
 		-i Makefile || die
 }
 
 src_compile() {
 	emake XCFLAGS="-fpic"
 	use static-libs && \
-		emake -C "${S}"-static build/debug/libmupdf.a
+		emake -C "${S}"-static build/debug/libmupdf{,-js-none}.a
 	use static && \
 		emake -C "${S}"-static XLIBS="-static"
 }
 
 src_install() {
 	if use X ; then
-		domenu debian/mupdf.desktop
-		doicon debian/mupdf.xpm
+		domenu platform/debian/mupdf.desktop
+		doicon platform/debian/mupdf.xpm
 	else
-		rm apps/man/mupdf.1
+		rm docs/man/mupdf.1
 	fi
 
 	emake install
 	dosym ${my_soname} /usr/$(get_libdir)/libmupdf.so
 
 	use static-libs && \
-		dolib.a "${S}"-static/build/debug/libmupdf.a
+		dolib.a "${S}"-static/build/debug/libmupdf{,-js-none}.a
 	if use static ; then
 		dobin "${S}"-static/build/debug/mu{tool,draw}
 		use X && dobin "${S}"-static/build/debug/mupdf
 	fi
 
-	#insinto /usr/include
-	#doins pdf/mupdf-internal.h fitz/fitz-internal.h xps/muxps-internal.h
-
 	insinto /usr/$(get_libdir)/pkgconfig
-	doins debian/mupdf.pc
+	doins platform/debian/mupdf.pc
 
-	dodoc README doc/{example.c,overview.txt}
+	dodoc README docs/*.{txt,c}
 }