Version bump, rename patch files, fix desktop file.

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

10 files changed, 180 insertions, 41 deletions

diff --git a/app-text/mupdf/ChangeLog b/app-text/mupdf/ChangeLog
index fab431a4b5c5..eb71c010a820 100644
--- a/app-text/mupdf/ChangeLog
+++ b/app-text/mupdf/ChangeLog
@@ -1,6 +1,18 @@
 # 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.86 2013/07/22 19:44:33 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/ChangeLog,v 1.87 2013/08/28 10:28:18 xmw Exp $
+
+*mupdf-1.3 (28 Aug 2013)
+
+  28 Aug 2013; Michael Weber <xmw@gentoo.org> +files/mupdf-1.3-CFLAGS.patch,
+  +files/mupdf-1.3-forward_back.patch, +files/mupdf-1.3-openjpeg2.patch,
+  +files/mupdf-1.3-pkg-config.patch, +files/mupdf-1.3-sys_curl.patch,
+  +files/mupdf-1.3-zoom-2.patch, +mupdf-1.3.ebuild,
+  -files/mupdf-9999-CFLAGS.patch, -files/mupdf-9999-forward_back.patch,
+  -files/mupdf-9999-openjpeg2.patch, -files/mupdf-9999-pkg-config.patch,
+  -files/mupdf-9999-sys_curl.patch, -files/mupdf-9999-zoom-2.patch,
+  mupdf-9999.ebuild:
+  Version bump, rename patch files, fix desktop file.
 
   22 Jul 2013; Michael Weber <xmw@gentoo.org> mupdf-9999.ebuild:
   Update live ebuild for new binary name.
diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index 4f2cc4ccd485..5d8b4ff11aa4 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -8,27 +8,29 @@ 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-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 568 SHA256 409432fd7021cc353e0b72fdda891d0d0f0f7508f8514e735a2d9c7884199ebe SHA512 1ad447d5d6468a920cf71b3e12bce1862894734522b5c0e5f87871799b239582f56eca08d69b5d1b366369dda6f93037136dff07126398d2b7a746406a9fdc0e WHIRLPOOL 6f0df1978cf4ed97a92b6e681e5bbdd888e55a86ceb6b538a6269df0474d090de7c7ba924090eebee271261d2db237593f5ba226f1851a2a6830a9f50fc7f9f0
-AUX mupdf-9999-sys_curl.patch 274 SHA256 842d421c810ae0f94736e1e832573daf2a6e9b4014c385af65980f7c73f4ff88 SHA512 888e8c8a6591b00e6f459ff4c36b842765a8e7f06b9382d453466f15576d22d88e53a42b372d94cc4f74c7ab13c33ecd74da52f371e330ffbf092480844c5ea1 WHIRLPOOL 4901caf92900d129ef2d5ef820e1fa28cadecda92bed3f306dc0b670ba9e88f9b233453f906a911bf9c938cc4a0da23c3d997531087cfa8cf9dc01134efa1a26
-AUX mupdf-9999-zoom-2.patch 216 SHA256 239f60b41a1afde0f01095c5d5052503491593887cb2338f201889ea0a1ef814 SHA512 caccead68c45f06b5f209330040d4afdb51da2506d5692f27c93ad96577d4f16fad27fc9a66097f09326d65225a3e2fe9206eef8698fb549d83c5a93a57fb396 WHIRLPOOL b8fac668373049887f06248800f39a239a133b905969ca1972bf4c6cb9529570a1df5b5816a367ad74dd3cdb49b59abff15d386524a65305564454fbfa48a8ae
+AUX mupdf-1.3-CFLAGS.patch 237 SHA256 86b25fd9f0a5cddf57d0da3f78d48a93bbeb898e99211db74bcdbd58f89de6f1 SHA512 71c745d01b297806baad20faaceedfd5a4637d00bc7da2162a980c6149ae31f9da10e92c6d50f8c637d578cfa29296ed1801aafe76c9e1438645067b8d65ea9e WHIRLPOOL 48eeefb77e7c21807887000750612f32e84cdeac642210820e5692fb32a2da113c946a901e011a80d16fca00d163a60fdc7756bf88459c0e3f2f4d49e0090ef0
+AUX mupdf-1.3-forward_back.patch 610 SHA256 35a230f388af1b90fb22d63f6eaf0d86eb1a37accdeff67c5df278adf95662fa SHA512 842e69766ab1239eb913a5b268b35b864d229f7cbc23b0ecf0ea1d187c836df948cf2d7026868232bb92ea746834b7cff30689f3d1f028862ac22e38396d88be WHIRLPOOL d3e4df25a5bdccb2b3a5884ca84defd52527b392a3ea2ca4bbd04f88695f85e66c022648c59bf8beb815bf28707989311dcac65317603c1ff1c431d8e569c2b6
+AUX mupdf-1.3-openjpeg2.patch 565 SHA256 cef07e1e03800e0c9e2522566d0bb2d43fc1459deb80721123efd0e6a6ac33cb SHA512 477ec4400a5f0c4fcd8450758fc1be31881f32de59c44ff6c7684be09ab4d797d38b3eeb8cd0fd9a2a2935e6f07f848d218a3a15972681fd5c772f78dd2798e7 WHIRLPOOL c4c9a6b7980d5c3c022e827d30b5acce21543522e8c36dd289b86006e5e6396d545aeede641be849f0ed99f25bbb88a9fd9fa1b18310292d78d70c856024efeb
+AUX mupdf-1.3-pkg-config.patch 566 SHA256 db96adf4cf505faf915c311d7c6d22d3e162fc60209db05f4fbfcbdade9fb465 SHA512 39f33daacdf00c45848045e2679e974be1f53f972528b47f7f140d393c7376524c6909b0cfbb7293580ce05d53d4c936dee03663c0e72c98964bda4b1a0e4644 WHIRLPOOL 5584ccbaab29602ca11668588609cc5c737d253a50dd2ce41b73d5a9e819ec0a17708e9f7eb46e79ad71d555a29ce7f29a43af5813e9281f00e9662ae8643738
+AUX mupdf-1.3-sys_curl.patch 272 SHA256 0fc67e0b7678967527124ae65555f762664cd935e692295071228fdfb775d42b SHA512 f303d13ea9ecf3abcf93a0bd58fc4d44d55ce2840ada686a8ebeaa04e085851eba4e9e83c3e39c12214c713d5d05f051342a3bdf44aa7273be01c98bc36b769b WHIRLPOOL 7bf70371e5552a0f402b775ab2de53939fdd5cb7e55085c6370df39264a83bbb50eb1b32e4801e2f2607e0aabf84dc3337b299c534be2b783a5519c2d0decdaa
+AUX mupdf-1.3-zoom-2.patch 214 SHA256 450b10fd3b9ed1d91df283db0086f89b02b9ff7f8a4d24f792ce6ea76f0c93e8 SHA512 95bb2d68246dc22eb0fb6e8a312c0f02476f356ee219c417dfa06473b5944d9e63ae6778cd967c70e60fb933eee1aac337efd2476b0bc791df1c69f7b7b822b3 WHIRLPOOL 47eb252b06e32cea80c5861f94ae5f391c6f803a0ee7dc8765d4eb7decc516936a0821c821957d17ab9a6f5b6d5c16bf071ad201bb1eea14cd04911059d3735d
 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
 DIST mupdf-1.2-source.zip 13808821 SHA256 9bc9e31ec27c091dad37f70940bd799e46ab6da4299bc58e803bff3dbb07dc3b SHA512 49261c5356d4e5648f89bfb783a23a3c3a470e044fe3b234f0906b0f6b71efad557981682e41ce3d754a5a31f1e5518e5e5f5f8dc83d2ca53181dbd3f4726e02 WHIRLPOOL 86fb60a2ac94c8ca4495c0891dd2b43ea49c9e212e2961f02914a3aaa5685566201f561c196da7d4c568dcec938eea8676959bbec839e33a7bff4e6410cc1a25
+DIST mupdf-1.3-source.tar.gz 14594969 SHA256 aba8b31bee9cc0a16abedab5e31c81c65996cba5591e62a50a79bea2a63d4478 SHA512 c79ba5838ae97acbe81f2eca9433473eaa1618a5ae718bd007fcc0e51d234f99bfadc297e291c398f25a0037f3f2d4e2f0ed5e412f8dc26d5561c362276529b3 WHIRLPOOL 3644e80279749e6490cf1429bc0f4b3dbb055a4342642ba37f8ebf5a018dd86e3ebc7b74f6a6814cdc83e3783a6a7a67d78128ad510a3976911461f88c63e048
 EBUILD mupdf-1.0.ebuild 1530 SHA256 7d66f2590ba2cd7e91f29237467d654f2768130f9c8b2aeec0d9670a8b4ae98c SHA512 59f4f7cd267e1be73ef16617d9fa1b6609774e22da4cc5424a2906ac04135d24b0154ff860e3b684feaba5dba82f10c6bb4eded52d10336233fafe28db3bf8a9 WHIRLPOOL 4a37ffa9e9217968883af86c25bc3f39ec104e6bda7d7d4c77c474edd06709c00bce5e787396a2499551f02eff973c6bfc5429d5626beef81764d862ac54a35a
 EBUILD mupdf-1.1.ebuild 1568 SHA256 d4abfb60ee5a76f3a4f945f39ea2711a2db798e090aa4abbb7fb4e824e75243c SHA512 3606032a262c47af85ad11d9b3c456382b6c9076268bcf23d055be973d60eeeef0002b59b44c6ceb15e990c1dc26a5c01d87212fc6c4f33f9e0ea6b2f3d1020e WHIRLPOOL 442c049ccc06de1a6cd7f810b8433bc50678acaa8c3982e21fe615233aa8d1e983f3cee7ceb06fb439203c6b7ba16674593c7f7ed7932be6c9650ae5633bd267
 EBUILD mupdf-1.1_p20121127.ebuild 1488 SHA256 4e11b767db4d78de3d5b7e83ca1ec97880c30375249db419265100366fd20585 SHA512 fdbe754cf384c594f754a31e3d5153f25fc43966fc359f999e2852eb3eefbe13d1ca03a022dfbfd0a649a1b1a4f6d84fd5232005a5203ead16768eb12fa32f90 WHIRLPOOL 7b1e8e8b2b2c5209a5cd81de3bc70d0dae0d905d12006800618b1ac31212fe5b2bb0aef6a7e6dd8151052f1d56a1437d0687b10e635ddf2529e35eb9daedb6b8
 EBUILD mupdf-1.2.ebuild 3266 SHA256 c872fc73b7f9ae250bf85ccc68cd7fb4fa3e991bea6843b751d154b49a6904b5 SHA512 f334e42f9edf370998169cdbf177267e78be07a050de91d9bf27369c28782eed67a94a19bd40a382657548a8467c81c7e690a01e94de666445c3a5ef3da26d08 WHIRLPOOL f647ab1dced46b023da7f1bb88dbcc00ff9eb3a48755e05ae5ce13f3e8fd8ac3315c2cb3780b1e106a6d90b2e8e2db6a28d8c674dcf876f876a424ddcf82911f
-EBUILD mupdf-9999.ebuild 3626 SHA256 ee9cb4d05ada62208227327ce21644fbd4a871ec4047c7db0e17a03d1fc34049 SHA512 26f24b2827d52846d3bff58243624e99bc1d4de7b92787c101bef9a311aaa62071e39c255313a7b943e5cef362caaff93e80eb51067bebfe29129e01d237d316 WHIRLPOOL bd80290ae3cfaa5ec333b48f12a2ab5df8da16ed3feff085f6689342f1bcfaf7de8c1cd14c9766a8b91098455e829373f81b99f6bbb88e5babe9af2854d5278f
-MISC ChangeLog 13473 SHA256 2b94aec8df4df427fcbc757198f0289cc681442eae8ced421442537ced3e0ed3 SHA512 264b82d9b1ba5b2464246733d12059b8871c3a756ed1cf4dc66c7805ba166118e9f6865a3d558573e846a165c0853750492d6db30da80ce3f87d66b6fe4ea898 WHIRLPOOL 57697cdfb6a37cb3a0c7d33f02968c1783b6bf6687d4fa0d82e3d18675d978a50386a428e45228004c1e5f90afb2ddf17d67775920de52823333646e3ffc08a4
+EBUILD mupdf-1.3.ebuild 3713 SHA256 395247bade98fb756bf3531b7753fabf4551bb70220ed5bf69dd9b6cdd5eeb20 SHA512 02afd6dc1144f3fa06ece3fb647aa50d191fb8f15e864bb50be4c737fc2ff117c421c8f8e5beabfe9beade41aa1b5d5fa119edffbc10af20b8994d845170ce6b WHIRLPOOL 28a7bebab9965f24d2125825ddccf753e99e77b3881d53088abe8622e7842de1ac88d7038b60bd38a1ac6a8cbcab61682c78682b2c160455ff527613ac00b14b
+EBUILD mupdf-9999.ebuild 3670 SHA256 3c682b6c69bc15fefbc0d0233ee5db235cd132b6856c2df89235ed738da3b630 SHA512 78ee23fd86ef54f099233502708811e2af46a7ced0e6c9d2cb402e1fd89b7eef7eb672b620750a27fbd00d32a50699ed8f5413310cf287e21c82bbfe3a301f29 WHIRLPOOL cb23c266a75f7adae15d36c6be3beea66bbcd476c7549aeec9ed960090f25aba83c15029d22d49bf7aabe67afcc31b110f0526aa51ee23de7b13948ecb4c8012
+MISC ChangeLog 14060 SHA256 a7f8515fc9b3499e14b434ff0c0d3b88d26cafe1b7bedf707d485982430ea442 SHA512 4703f3ca9a45178553fd5300b44bca011e561155e352c04b23dc28e464373eae73d5165f42425bba3696b29403646c6858b58e32dd270ae0d0f839fcc031faae WHIRLPOOL 4d98e445c3b7e351ac609fbb4d772db7a60cc31d4797c222d92f20f17469d4c3d511d86e9715ec9268d648be3481a366797910ff2070db000d0041d87a11f519
 MISC metadata.xml 224 SHA256 f810c6de744adceee241992d3f713142db3e7025986f6cc5898cfe3c9cb2f4a7 SHA512 4f78d959809ec0db2f9be2a7747d572fa8ee03d177044dd46574881a6ee83736510b76062c12daecae609282d197ba466e8a3e3a654b1383e04c659acd41bef5 WHIRLPOOL 0300a228d371c918b051bc24859dfe4e5d0d2a71b80f697f202749c5aca69efcee4be6e69454c9abfa4ced28e19a9d1f71d6d7eaf54290b8d03b5c04fd209868
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iF4EAREIAAYFAlHti5gACgkQknrdDGLu8JDbzgD9ElHN7u5IfyUlved9yXNuPzyO
-hOv7APwz/cU8frkS7W8BAI89oCGMYYqHSuA5BS9f401OgkKq2w+rqsguQdweEKNN
-=/PQ/
+iF4EAREIAAYFAlId0MMACgkQknrdDGLu8JD6hQD/QmgRHd/NtBWWBYTvmIZmvjGW
+/HtHYwpNaJBFeCS0fk4BAIcs8xqHJPDR5KY66Ly70Kz/oaz0V+j+BIS55JZA41tq
+=7T0I
 -----END PGP SIGNATURE-----
diff --git a/app-text/mupdf/files/mupdf-9999-CFLAGS.patch b/app-text/mupdf/files/mupdf-1.3-CFLAGS.patch
index 487c2128d12f..3c44e98db1ae 100644
--- a/app-text/mupdf/files/mupdf-9999-CFLAGS.patch
+++ b/app-text/mupdf/files/mupdf-1.3-CFLAGS.patch
@@ -1,5 +1,5 @@
---- mupdf-1.0-source/Makerules
-+++ mupdf-1.0-source/Makerules
+--- mupdf-1.3/Makerules
++++ mupdf-1.3/Makerules
 @@ -6,7 +6,7 @@
  CFLAGS += -Wall
  
diff --git a/app-text/mupdf/files/mupdf-9999-forward_back.patch b/app-text/mupdf/files/mupdf-1.3-forward_back.patch
index 35c6f1df1594..aafe35af65d7 100644
--- a/app-text/mupdf/files/mupdf-9999-forward_back.patch
+++ b/app-text/mupdf/files/mupdf-1.3-forward_back.patch
@@ -1,8 +1,8 @@
 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
+--- mupdf-1.3/platform/x11/x11_main.c
++++ mupdf-1.3/platform/x11/x11_main.c
 @@ -5,6 +5,7 @@
  #include <X11/Xatom.h>
  #include <X11/cursorfont.h>
diff --git a/app-text/mupdf/files/mupdf-9999-openjpeg2.patch b/app-text/mupdf/files/mupdf-1.3-openjpeg2.patch
index 68f6c85b794e..789e4420c374 100644
--- a/app-text/mupdf/files/mupdf-9999-openjpeg2.patch
+++ b/app-text/mupdf/files/mupdf-1.3-openjpeg2.patch
@@ -1,7 +1,7 @@
 http://bugs.ghostscript.com/show_bug.cgi?id=693518
 
---- mupdf-9999/Makerules
-+++ mupdf-9999/Makerules
+--- mupdf-1.3/Makerules
++++ mupdf-1.3/Makerules
 @@ -52,8 +52,8 @@
  
  SYS_FREETYPE_CFLAGS = $(shell pkg-config --cflags freetype2)
diff --git a/app-text/mupdf/files/mupdf-9999-pkg-config.patch b/app-text/mupdf/files/mupdf-1.3-pkg-config.patch
index f0ccfb3e60ff..f943014a6b1d 100644
--- a/app-text/mupdf/files/mupdf-9999-pkg-config.patch
+++ b/app-text/mupdf/files/mupdf-1.3-pkg-config.patch
@@ -4,8 +4,8 @@ http://bugs.ghostscript.com/show_bug.cgi?id=694301
 openjpeg-2
 http://bugs.ghostscript.com/show_bug.cgi?id=693518
 
---- mupdf-9999/platform/debian/mupdf.pc
-+++ mupdf-9999/platform/debian/mupdf.pc
+--- mupdf-1.3/platform/debian/mupdf.pc
++++ mupdf-1.3/platform/debian/mupdf.pc
 @@ -4,9 +4,9 @@
  includedir=${prefix}/include
  
diff --git a/app-text/mupdf/files/mupdf-9999-sys_curl.patch b/app-text/mupdf/files/mupdf-1.3-sys_curl.patch
index 1866dbdf7e59..a388c0a26e67 100644
--- a/app-text/mupdf/files/mupdf-9999-sys_curl.patch
+++ b/app-text/mupdf/files/mupdf-1.3-sys_curl.patch
@@ -1,5 +1,5 @@
---- mupdf-9999/Makerules
-+++ mupdf-9999/Makerules
+--- mupdf-1.3/Makerules
++++ mupdf-1.3/Makerules
 @@ -63,6 +63,8 @@
  SYS_JBIG2DEC_LIBS = -ljbig2dec
  SYS_JPEG_LIBS = -ljpeg
diff --git a/app-text/mupdf/files/mupdf-9999-zoom-2.patch b/app-text/mupdf/files/mupdf-1.3-zoom-2.patch
index 2c9c8c9fd874..353912450236 100644
--- a/app-text/mupdf/files/mupdf-9999-zoom-2.patch
+++ b/app-text/mupdf/files/mupdf-1.3-zoom-2.patch
@@ -1,5 +1,5 @@
---- mupdf-9999/platform/x11/pdfapp.c
-+++ mupdf-9999/platform/x11/pdfapp.c
+--- mupdf-1.3/platform/x11/pdfapp.c
++++ mupdf-1.3/platform/x11/pdfapp.c
 @@ -866,6 +867,7 @@
  		break;
  
diff --git a/app-text/mupdf/mupdf-1.3.ebuild b/app-text/mupdf/mupdf-1.3.ebuild
new file mode 100644
index 000000000000..9c43c4e583a4
--- /dev/null
+++ b/app-text/mupdf/mupdf-1.3.ebuild
@@ -0,0 +1,125 @@
+# 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-1.3.ebuild,v 1.1 2013/08/28 10:28:18 xmw Exp $
+
+EAPI=5
+
+inherit eutils flag-o-matic multilib toolchain-funcs
+
+DESCRIPTION="a lightweight PDF viewer and toolkit written in portable C"
+HOMEPAGE="http://mupdf.com/"
+SRC_URI="http://${PN}.googlecode.com/files/${P}-source.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0/1.2"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="X vanilla static static-libs"
+
+LIB_DEPEND="dev-libs/openssl[static-libs?]
+	media-libs/freetype:2[static-libs?]
+	media-libs/jbig2dec[static-libs?]
+	media-libs/openjpeg:2[static-libs?]
+	net-misc/curl[static-libs?]
+	virtual/jpeg[static-libs?]
+	X? ( x11-libs/libX11[static-libs?]
+		x11-libs/libXext[static-libs?] )"
+RDEPEND="${LIB_DEPEND}"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	static-libs? ( ${LIB_DEPEND} )
+	static? ( ${LIB_DEPEND//?}
+		app-arch/bzip2[static-libs]
+		x11-libs/libXau[static-libs]
+		x11-libs/libXdmcp[static-libs]
+		x11-libs/libxcb[static-libs] )"
+
+S=${WORKDIR}/${P}-source
+
+src_prepare() {
+	rm -rf thirdparty || die
+
+	epatch \
+		"${FILESDIR}"/${P}-CFLAGS.patch \
+		"${FILESDIR}"/${P}-openjpeg2.patch \
+		"${FILESDIR}"/${P}-pkg-config.patch \
+		"${FILESDIR}"/${P}-sys_curl.patch
+
+	sed -e "/^libdir=/s:/lib:/$(get_libdir):" \
+		-e "/^prefix=/s:=.*:=${EROOR}/usr:" \
+		-i platform/debian/${PN}.pc || die
+
+	use vanilla || epatch \
+		"${FILESDIR}"/${P}-zoom-2.patch \
+		"${FILESDIR}"/${P}-forward_back.patch
+
+	#http://bugs.ghostscript.com/show_bug.cgi?id=693467
+	sed -e '/^\(Actions\|MimeType\)=/s:\(.*\):\1;:' \
+		-i platform/debian/${PN}.desktop || die
+
+	sed -e "\$aOS = Linux" \
+		-e "\$aCC = $(tc-getCC)" \
+		-e "\$aLD = $(tc-getCC)" \
+		-e "\$aAR = $(tc-getAR)" \
+		-e "\$averbose = true" \
+		-e "\$abuild = debug" \
+		-e "\$aprefix = ${ED}usr" \
+		-e "\$alibdir = ${ED}usr/$(get_libdir)" \
+		-i Makerules || die
+
+	if ! use X ; then
+		sed -e "\$aNOX11 = yes" \
+			-i Makerules || die
+	fi
+
+	if use static-libs || use static ; then
+		cp -a "${S}" "${S}"-static || die
+		#add missing Libs.private for xcb and freetype
+		sed -e 's:\(pkg-config --libs\):\1 --static:' \
+		    -e '/^SYS_X11_LIBS = /s:\(.*\):\1 -lpthread:' \
+		    -e '/^SYS_FREETYPE_LIBS = /s:\(.*\):\1 -lbz2:' \
+			-i "${S}"-static/Makerules || die
+	fi
+
+	my_soname=libmupdf.so.1.2
+	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/lib${PN}{,-js-none}.a
+	use static && \
+		emake -C "${S}"-static XLIBS="-static"
+}
+
+src_install() {
+	if use X ; then
+		domenu platform/debian/${PN}.desktop
+		doicon platform/debian/${PN}.xpm
+	else
+		rm docs/man/${PN}.1
+	fi
+
+	emake install
+	dosym ${my_soname} /usr/$(get_libdir)/lib${PN}.so
+
+	use static-libs && \
+		dolib.a "${S}"-static/build/debug/lib${PN}{,-js-none}.a
+	if use static ; then
+		dobin "${S}"-static/build/debug/mu{tool,draw}
+		use X && dobin "${S}"-static/build/debug/${PN}-x11
+	fi
+	use X && dosym ${PN}-x11 /usr/bin/${PN}
+
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins platform/debian/${PN}.pc
+
+	dodoc README docs/*.{txt,c}
+}
diff --git a/app-text/mupdf/mupdf-9999.ebuild b/app-text/mupdf/mupdf-9999.ebuild
index 43d7df7e511e..95c0cf9d5966 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.40 2013/07/22 19:44:33 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-9999.ebuild,v 1.41 2013/08/28 10:28:18 xmw Exp $
 
 EAPI=5
 
@@ -38,21 +38,21 @@ src_prepare() {
 	rm -rf thirdparty || die
 
 	epatch \
-		"${FILESDIR}"/${P}-CFLAGS.patch \
-		"${FILESDIR}"/${P}-openjpeg2.patch \
-		"${FILESDIR}"/${P}-pkg-config.patch \
-		"${FILESDIR}"/${P}-sys_curl.patch
+		"${FILESDIR}"/${PN}-1.3-CFLAGS.patch \
+		"${FILESDIR}"/${PN}-1.3-openjpeg2.patch \
+		"${FILESDIR}"/${PN}-1.3-pkg-config.patch \
+		"${FILESDIR}"/${PN}-1.3-sys_curl.patch
 
 	sed -e "/^libdir=/s:/lib:/$(get_libdir):" \
 		-e "/^prefix=/s:=.*:=${EROOR}/usr:" \
 		-i platform/debian/${PN}.pc || die
 
 	use vanilla || epatch \
-		"${FILESDIR}"/${P}-zoom-2.patch \
-		"${FILESDIR}"/${P}-forward_back.patch
+		"${FILESDIR}"/${PN}-1.3-zoom-2.patch \
+		"${FILESDIR}"/${PN}-1.3-forward_back.patch
 
 	#http://bugs.ghostscript.com/show_bug.cgi?id=693467
-	sed -e '/^Actions=/s:=.*:=View;:' \
+	sed -e '/^\(Actions\|MimeType\)=/s:\(.*\):\1;:' \
 		-i platform/debian/${PN}.desktop || die
 
 	sed -e "\$aOS = Linux" \
@@ -93,32 +93,32 @@ src_prepare() {
 src_compile() {
 	emake XCFLAGS="-fpic"
 	use static-libs && \
-		emake -C "${S}"-static build/debug/libmupdf{,-js-none}.a
+		emake -C "${S}"-static build/debug/lib${PN}{,-js-none}.a
 	use static && \
 		emake -C "${S}"-static XLIBS="-static"
 }
 
 src_install() {
 	if use X ; then
-		domenu platform/debian/mupdf.desktop
-		doicon platform/debian/mupdf.xpm
+		domenu platform/debian/${PN}.desktop
+		doicon platform/debian/${PN}.xpm
 	else
-		rm docs/man/mupdf.1
+		rm docs/man/${PN}.1
 	fi
 
 	emake install
-	dosym ${my_soname} /usr/$(get_libdir)/libmupdf.so
+	dosym ${my_soname} /usr/$(get_libdir)/lib${PN}.so
 
 	use static-libs && \
-		dolib.a "${S}"-static/build/debug/libmupdf{,-js-none}.a
+		dolib.a "${S}"-static/build/debug/lib${PN}{,-js-none}.a
 	if use static ; then
 		dobin "${S}"-static/build/debug/mu{tool,draw}
-		use X && dobin "${S}"-static/build/debug/mupdf-x11
+		use X && dobin "${S}"-static/build/debug/${PN}-x11
 	fi
-	use X && dosym mupdf-x11 /usr/bin/mupdf
+	use X && dosym ${PN}-x11 /usr/bin/${PN}
 
 	insinto /usr/$(get_libdir)/pkgconfig
-	doins platform/debian/mupdf.pc
+	doins platform/debian/${PN}.pc
 
 	dodoc README docs/*.{txt,c}
 }