Fix USE=-X for >1.4 (bug 514202, thanks patrick) and .so names, Version bump to 1.5, USE=openssl and curl for >=1.5.

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

7 files changed, 196 insertions, 38 deletions

diff --git a/app-text/mupdf/ChangeLog b/app-text/mupdf/ChangeLog
index f2021efa7f02..8b5ff56cf770 100644
--- a/app-text/mupdf/ChangeLog
+++ b/app-text/mupdf/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-text/mupdf
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/ChangeLog,v 1.105 2014/06/05 11:04:14 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/ChangeLog,v 1.106 2014/07/21 22:00:02 xmw Exp $
+
+*mupdf-1.4-r1 (21 Jul 2014)
+*mupdf-1.5 (21 Jul 2014)
+
+  21 Jul 2014; Michael Weber <xmw@gentoo.org>
+  +files/mupdf-1.5-Makerules-openssl-curl.patch, +mupdf-1.4-r1.ebuild,
+  +mupdf-1.5.ebuild, -mupdf-1.4.ebuild, metadata.xml, mupdf-9999.ebuild:
+  Fix USE=-X for >1.4 (bug 514202, thanks patrick) and .so names, Version bump
+  to 1.5, USE=openssl and curl for >=1.5.
 
   05 Jun 2014; Michael Weber <xmw@gentoo.org>
   +files/mupdf-1.4-old-debian-files.patch, mupdf-9999.ebuild:
diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index ea289a41d2fd..065b425d9bc3 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -15,23 +15,26 @@ AUX mupdf-1.3-pkg-config.patch 566 SHA256 db96adf4cf505faf915c311d7c6d22d3e162fc
 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
 AUX mupdf-1.4-old-debian-files.patch 13411 SHA256 469c1d1fe0806687d26d04a7352aab86f88e871a52f8fdc29dec2d74eddc1169 SHA512 b52f8bd62d515797875204f7aab516f7f24eaade7976d78b470f351579f649a4cad40d085d79d3fcb1ea58356683dac6c39e4aee2131894a2673ce09bb574748 WHIRLPOOL 37eda12ef5b3817d0cecfe6f67a7cc9f2808452e727e1c1aa680c4ab30ccfcfe8817602a8ab980415022a380a0728694fb30241960c9f712acdb51df23ee9774
+AUX mupdf-1.5-Makerules-openssl-curl.patch 750 SHA256 5c485ac279d895afd25f2ced4a557de61182abc29ff09ef89a06718921863b10 SHA512 39d01ebd668abbbe544919f718d6ae3b150e3144e0c6dc01f36a97f5fb6e96fb6740f625a8d258cfc5a47705c9e1481c0ede782d7a817288e8052f223e456615 WHIRLPOOL 66ed76bf45f57f778fb3f39f947d936e967521b01d9f56673b8344f42d77d35be24f984467cce62e564ee2d023979722d274f5f291263b4bd29fee435438499e
 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
 DIST mupdf-1.4.tar.gz 7470075 SHA256 ccac5ad1129f051dbaecbeec01b85f548c8bdb1c97b5e1dd397299bf7f988438 SHA512 6de95fa02e3ebaf2f268765df7eb4c1b53ef0b3b39b57b8e64097c429727dd483894e3a62c520151197290a8e392b9b1746109fc3eb528b44245040acc82a25e WHIRLPOOL a43ab9bbaf5cd5e40445ace3fdeb9e0b57e4924c7e9a7669899275da2c8a41725d862fb1cd85d779852ec794be8184b7d21aaee932024d7d0557e076de6611a4
+DIST mupdf-1.5.tar.gz 7485699 SHA256 946393c7abf78e50fa9815f18a9e91f275a1a96a7ea14ae39b5237944070d1f5 SHA512 bfb79838eba629295ab164cf37e49edc8846689598fbad9312409535022a2e747bd062718b899909564c6cf5826fb46a2b4b579ced8c7a3896d6098e7e5ccf40 WHIRLPOOL ebcaf5f677984a78aecf9eeb72e7a79e6e2a6388db5024427d8bf55f31b3690844dd291ada3cd578a5bb9a370ea21cb2a044656c21a0ef47cdf7bfc42c842beb
 EBUILD mupdf-1.1_p20121127.ebuild 1488 SHA256 4e11b767db4d78de3d5b7e83ca1ec97880c30375249db419265100366fd20585 SHA512 fdbe754cf384c594f754a31e3d5153f25fc43966fc359f999e2852eb3eefbe13d1ca03a022dfbfd0a649a1b1a4f6d84fd5232005a5203ead16768eb12fa32f90 WHIRLPOOL 7b1e8e8b2b2c5209a5cd81de3bc70d0dae0d905d12006800618b1ac31212fe5b2bb0aef6a7e6dd8151052f1d56a1437d0687b10e635ddf2529e35eb9daedb6b8
 EBUILD mupdf-1.2.ebuild 3259 SHA256 00fa6f25eceae7e70590e37dc6173830d3042fc7ce4ae24f4969f3dbf3ac17cc SHA512 495388528ca026e6d5b1b33e0b7449c48c34006791bd969cd181757175928e7003a4cb0f72839627442feee1eaee49065f0db68e4cf11912da2c970e5d8f32bf WHIRLPOOL 0c010b3dee2bb4378f96b95637867a88d139f9f7dbdf083705a1fbd7491849556f7721ee49cef0afcaf8cedd2793c17df6c14e08a919e875eeb23debfb4820ba
 EBUILD mupdf-1.3_p20140118.ebuild 3876 SHA256 f8e63358add7f5381a68f3d2913edee9be83ec937006aa51ec6029ea44d3bc70 SHA512 09f435760a8a758b7f879a35fae5270a5a43e6c39480d3ae0d9d13b6762ce9efe9ebbb4a3eaba4902d8e1bb8cd5f8a73698a81956aaba8c89d315836373b17a6 WHIRLPOOL d22872933906f190ee8180fde8b7b24ce22f5573979f0c64dc2a77e9662a79753d144f88c5ec24ecd5b4bfa7f5182dac05ca3183e8eee9be1e198a9eeaeca6d7
-EBUILD mupdf-1.4.ebuild 3868 SHA256 9652fade2ea17e8a9ceb8d9b266cec93b091c67f1050f271a2d093e8766456ae SHA512 791f4dd5ce58ea527e012dd280961824dd9465a2fbab6835349216d6795abd861e3b5ca9b1188bcc9ffde1a15e7a88774c0402afa3375c950ab3391ba01c4802 WHIRLPOOL 42d8b116c13e8c08af3af4914d876baa48fecfbeaec6cc009a0b2cd2fc79fd5a06a1b389f1dce80e00860d8a144725e810b0e8c51fbbb3f27b194f6b97754ea0
-EBUILD mupdf-9999.ebuild 3630 SHA256 d9316b39e727a6a9d52619c98ba58bc4cc9e54829146de578648826133bd1782 SHA512 e932378d87bc699fffab8d3c5707dd85cc7bf37d70bf3a93ee72d27716034c628323ee6e657310bf4ef3bd10ab9cf6e2468165cec574a25886c152a5576adcf5 WHIRLPOOL d8cb69e12c9cae4866021476ef703b8fa82512828d749a3cec09644ba22db1a4b1e84555a6380da5b4f0050f7adb4efa7a50324cd9136cea71e82a5c349038f9
-MISC ChangeLog 16297 SHA256 176de955b0f28b711dc86041d9f8c728a2cfdbd63ecb8a51a157861a92dc0b05 SHA512 3ce5ac9ea0db0069577acef311467f4e3572d319b50f9f0873408fb12039417d58e3f6b016a933da136669c679fa9fda083aa74148838aa9bb8250cf69b4f3d1 WHIRLPOOL 777a6ce0a4b28334c7cc4aae15afc80140a6beadab7381cc2c1b4e1a47a9626bb5a6fa78a447b275c42f20e7b2836b819a924ceec0fb4f09e777fa1dc8470157
-MISC metadata.xml 224 SHA256 f810c6de744adceee241992d3f713142db3e7025986f6cc5898cfe3c9cb2f4a7 SHA512 4f78d959809ec0db2f9be2a7747d572fa8ee03d177044dd46574881a6ee83736510b76062c12daecae609282d197ba466e8a3e3a654b1383e04c659acd41bef5 WHIRLPOOL 0300a228d371c918b051bc24859dfe4e5d0d2a71b80f697f202749c5aca69efcee4be6e69454c9abfa4ced28e19a9d1f71d6d7eaf54290b8d03b5c04fd209868
+EBUILD mupdf-1.4-r1.ebuild 3861 SHA256 0ea7cfe56162a934b998c0838fdcef33150daf264266bacd50dc12add52818cc SHA512 7050e5fd72f0a42a007024f334b2859decc5eabd3981c2e9d93860a48ebc3d1ccc4d41bd17115cb4840882d32fd71cab627dd8f8ce0eed4d5eb65b2999b74916 WHIRLPOOL b94d46bb4a0ce8e372604390f63c1f847d1f451742a291ee65bd3af02a2e2ec46fc05b9fe0b26c1aa67ef5d20456581d18faa2f6be1bbbb21fe7ea48fe217ca0
+EBUILD mupdf-1.5.ebuild 3831 SHA256 b3b5a77bcd28698ba11f773226c6a4e5bd826051db8338c5bb6e4785909b1326 SHA512 8aaf6ce3128e6e1adfe24353e277a2b7bc038f6e8f4e0c368df388b08a3875afc1e8e8144b34e605d13100c7172ee2facde9124b868748eb17a4c3ff2cc20ba5 WHIRLPOOL 28c7ebb2dbf7c4758afdfb2b5911cced25e7676308b29f1e02cb0e9de9fdf32c58205416251a81190f3c27ee904fc2566196fc45fabcfa85eb763dd450aa6943
+EBUILD mupdf-9999.ebuild 3673 SHA256 7a95c3a456f455ae73f5ee5f3b09aea841782dc628dbb0a93680d68a4db37917 SHA512 91ac75caf38430ea879a5589fd0a310577a44b3ccb099f03e141821a46f466b40babcc03ad011fe4a805961d762c9bef070c97dd0132130c82d865c50af3c2df WHIRLPOOL bf089af58e99d3c06f8a056ee4413c6c8b2024500e9a8cc7d98ac152c5b829fb3233cfbe57a7b8c0580b5a6ec818ee349a1b2ce3dfcbf76ea0f1866560603131
+MISC ChangeLog 16663 SHA256 83d334aba7b0e97e356c68d1873018ee93bdbda99c6d637a3c249516ac5f8208 SHA512 e2f550b6cb5266d1a67c516810cdddec39b99c04ed22c28d3213bd3fe06600a2e14f60905094fa10c9260eb4d8b4bb6d949b7d975bbbbf71b4e985c8e9f6f7f4 WHIRLPOOL 86cccc7eacc95b0793c9af257c16974fa13285e1446933ee5e0e513f3b877f05568a508e0736d8fa84e3466515b98e19b40fff74a9a1dd19a2fe41ac52fc431d
+MISC metadata.xml 302 SHA256 bde1ed5d5b77f24350d5708444153fdfc15593205bfbc58f115d2b7e292d404b SHA512 4c1b0f1ba4c185f0d80e10b094cbb41e8467308367bc6d37f51d82aba522c7d60189f3c6efa22f433d7ce25ec77ac25e9a5fdb9b00aef31c9e3fc1dd00fdbc08 WHIRLPOOL cf4814a563fd457b6e2979939fe693d765a6b87465f66ee9883c3d06723122dfe8de59e96055d7acbd8924d4d61f8627a704289e3bcc0c01a4742426780931b6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iL4EAREIAGYFAlOQTq9fFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
+iL4EAREIAGYFAlPNjW1fFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
 bnBncC5maWZ0aGhvcnNlbWFuLm5ldDY3QjA4MzdGODg1NUMxMjIzNUQ0MDgxNzky
-N0FERDBDNjJFRUYwOTAACgkQknrdDGLu8JCS2AD+NrfxC9HwYUlgQcZJMc7AjHtJ
-Jf0mLFZ+GRgNiYxOroEBAJn886PzjAg5SfUTl6vCgrJYaC8MrNiEMau5PgLxtwOI
-=jm++
+N0FERDBDNjJFRUYwOTAACgkQknrdDGLu8JBjSgEAmwBRQ6Xdvl0QQjKItGenzipb
+HuZAA9YEHGbuRdfmrFUA/2LCHT3TGXq4XRGYAlvLk9m20LJQXKPJXqEgZBDMspdG
+=s33N
 -----END PGP SIGNATURE-----
diff --git a/app-text/mupdf/files/mupdf-1.5-Makerules-openssl-curl.patch b/app-text/mupdf/files/mupdf-1.5-Makerules-openssl-curl.patch
new file mode 100644
index 000000000000..bc9312a937f1
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.5-Makerules-openssl-curl.patch
@@ -0,0 +1,27 @@
+--- mupdf-1.5/Makerules
++++ mupdf-1.5/Makerules
+@@ -58,17 +58,23 @@
+ 
+ HAVE_X11 ?= yes
+ 
++WANT_OPENSSL ?= yes
++ifeq "$(WANT_OPENSSL)" "yes"
+ ifeq "$(shell pkg-config --exists libcrypto && echo yes)" "yes"
+ SYS_OPENSSL_CFLAGS = -DHAVE_OPENSSL $(shell pkg-config --cflags libcrypto)
+ SYS_OPENSSL_LIBS = $(shell pkg-config --libs libcrypto)
+ endif
++endif
+ 
++WANT_CURL ?= yes
++ifeq "$(WANT_CURL)" "yes"
+ ifeq "$(shell pkg-config --exists libcurl && echo yes)" "yes"
+ HAVE_CURL = yes
+ SYS_CURL_CFLAGS = $(shell pkg-config --cflags libcurl)
+ SYS_CURL_LIBS = $(shell pkg-config --libs libcurl)
+-endif
+ SYS_CURL_DEPS = -lpthread -lrt
++endif
++endif
+ 
+ SYS_X11_CFLAGS = $(shell pkg-config --cflags x11 xext)
+ SYS_X11_LIBS = $(shell pkg-config --libs x11 xext)
diff --git a/app-text/mupdf/metadata.xml b/app-text/mupdf/metadata.xml
index 59acc2cc580e..53b35c21cd8f 100644
--- a/app-text/mupdf/metadata.xml
+++ b/app-text/mupdf/metadata.xml
@@ -5,5 +5,8 @@
 <email>xmw@gentoo.org</email>
 <name>Michael Weber</name>
 </maintainer>
+<use>
+	<flag name="openssl">Use dev-libs/openssl crypto backend</flag>
+</use>
 </pkgmetadata>
 
diff --git a/app-text/mupdf/mupdf-1.4.ebuild b/app-text/mupdf/mupdf-1.4-r1.ebuild
index dbab2294c60f..aa59e6b77737 100644
--- a/app-text/mupdf/mupdf-1.4.ebuild
+++ b/app-text/mupdf/mupdf-1.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-1.4.ebuild,v 1.2 2014/06/05 09:45:20 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-1.4-r1.ebuild,v 1.1 2014/07/21 22:00:02 xmw Exp $
 
 EAPI=5
 
@@ -58,16 +58,14 @@ src_prepare() {
 		-e "\$aCC = $(tc-getCC)" \
 		-e "\$aLD = $(tc-getCC)" \
 		-e "\$aAR = $(tc-getAR)" \
-		-e "\$averbose = true" \
+		-e "\$averbose = yes" \
 		-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
+	sed -e "\$aHAVE_X11 = $(usex X yes no)" \
+		-i Makerules || die
 
 	if use static-libs || use static ; then
 		cp -a "${S}" "${S}"-static || die
@@ -78,8 +76,8 @@ src_prepare() {
 			-i "${S}"-static/Makerules || die
 	fi
 
-	my_soname=libmupdf.so.1.3
-	my_soname_js_none=libmupdf-js-none.so.1.3
+	my_soname=libmupdf.so.1.4
+	my_soname_js_none=libmupdf-js-none.so.1.4
 	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}:" \
diff --git a/app-text/mupdf/mupdf-1.5.ebuild b/app-text/mupdf/mupdf-1.5.ebuild
new file mode 100644
index 000000000000..8242d9a0a61c
--- /dev/null
+++ b/app-text/mupdf/mupdf-1.5.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-1.5.ebuild,v 1.1 2014/07/21 22:00:02 xmw Exp $
+
+EAPI=5
+
+inherit eutils multilib toolchain-funcs vcs-snapshot
+
+DESCRIPTION="a lightweight PDF viewer and toolkit written in portable C"
+HOMEPAGE="http://mupdf.com/"
+SRC_URI="http://git.ghostscript.com/?p=mupdf.git;a=snapshot;h=b2f096de23e5341fbbcd7c290f3a144423741906;sf=tgz -> ${P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0/1.5"
+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"
+
+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] )"
+
+src_prepare() {
+	rm -rf thirdparty || die
+
+	epatch \
+		"${FILESDIR}"/${PN}-1.3-CFLAGS.patch \
+		"${FILESDIR}"/${PN}-1.4-old-debian-files.patch \
+		"${FILESDIR}"/${PN}-1.3-pkg-config.patch \
+		"${FILESDIR}"/${PN}-1.5-Makerules-openssl-curl.patch
+
+	sed -e "/^libdir=/s:/lib:/$(get_libdir):" \
+		-e "/^prefix=/s:=.*:=${EROOT}/usr:" \
+		-i platform/debian/${PN}.pc || die
+
+	use vanilla || epatch \
+		"${FILESDIR}"/${PN}-1.3-zoom-2.patch
+
+	#http://bugs.ghostscript.com/show_bug.cgi?id=693467
+	sed -e '/^\(Actions\|MimeType\)=/s:\(.*\):\1;:' \
+		-i platform/debian/${PN}.desktop || die
+
+	sed -e "1iOS = Linux" \
+		-e "1iCC = $(tc-getCC)" \
+		-e "1iLD = $(tc-getCC)" \
+		-e "1iAR = $(tc-getAR)" \
+		-e "1iverbose = yes" \
+		-e "1ibuild = debug" \
+		-e "1iprefix = ${ED}usr" \
+		-e "1ilibdir = ${ED}usr/$(get_libdir)" \
+	    -e "1iHAVE_X11 = $(usex X)" \
+		-e "1iWANT_OPENSSL = $(usex openssl)" \
+		-e "1iWANT_CURL = $(usex curl)" \
+		-i Makerules || die
+
+	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.5
+	my_soname_js_none=libmupdf-js-none.so.1.5
+	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 012e13df8cc6..7e847f1b472b 100644
--- a/app-text/mupdf/mupdf-9999.ebuild
+++ b/app-text/mupdf/mupdf-9999.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 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.46 2014/06/05 11:04:14 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-9999.ebuild,v 1.47 2014/07/21 22:00:02 xmw Exp $
 
 EAPI=5
 
-inherit eutils git-2 flag-o-matic multilib toolchain-funcs
+inherit eutils git-2 multilib toolchain-funcs
 
 DESCRIPTION="a lightweight PDF viewer and toolkit written in portable C"
 HOMEPAGE="http://mupdf.com/"
@@ -12,9 +12,9 @@ EGIT_REPO_URI="git://git.ghostscript.com/mupdf.git"
 #EGIT_HAS_SUBMODULES=1
 
 LICENSE="AGPL-3"
-SLOT="0/1.3"
+SLOT="0/1.5"
 KEYWORDS=""
-IUSE="X vanilla static static-libs"
+IUSE="X vanilla curl openssl static static-libs"
 
 LIB_DEPEND="dev-libs/openssl[static-libs?]
 	media-libs/freetype:2[static-libs?]
@@ -41,7 +41,7 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-1.3-CFLAGS.patch \
 		"${FILESDIR}"/${PN}-1.4-old-debian-files.patch \
 		"${FILESDIR}"/${PN}-1.3-pkg-config.patch \
-		"${FILESDIR}"/${PN}-1.3-sys_curl.patch
+		"${FILESDIR}"/${PN}-1.5-Makerules-openssl-curl.patch
 
 	sed -e "/^libdir=/s:/lib:/$(get_libdir):" \
 		-e "/^prefix=/s:=.*:=${EROOT}/usr:" \
@@ -54,21 +54,19 @@ src_prepare() {
 	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)" \
+	sed -e "1iOS = Linux" \
+		-e "1iCC = $(tc-getCC)" \
+		-e "1iLD = $(tc-getCC)" \
+		-e "1iAR = $(tc-getAR)" \
+		-e "1iverbose = yes" \
+		-e "1ibuild = debug" \
+		-e "1iprefix = ${ED}usr" \
+		-e "1ilibdir = ${ED}usr/$(get_libdir)" \
+	    -e "1iHAVE_X11 = $(usex X)" \
+		-e "1iWANT_OPENSSL = $(usex openssl)" \
+		-e "1iWANT_CURL = $(usex curl)" \
 		-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
@@ -78,8 +76,8 @@ src_prepare() {
 			-i "${S}"-static/Makerules || die
 	fi
 
-	my_soname=libmupdf.so.1.3
-	my_soname_js_none=libmupdf-js-none.so.1.3
+	my_soname=libmupdf.so.1.5
+	my_soname_js_none=libmupdf-js-none.so.1.5
 	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}:" \