Static builds, static openjpeg, desktop file.

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

5 files changed, 82 insertions, 53 deletions

diff --git a/app-text/mupdf/ChangeLog b/app-text/mupdf/ChangeLog
index 173b0621cf75..2956fe7e76ba 100644
--- a/app-text/mupdf/ChangeLog
+++ b/app-text/mupdf/ChangeLog
@@ -1,6 +1,10 @@
 # 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.71 2013/06/08 03:04:34 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/ChangeLog,v 1.72 2013/06/08 11:31:51 xmw Exp $
+
+  08 Jun 2013; Michael Weber <xmw@gentoo.org> files/mupdf-9999-openjpeg2.patch,
+  mupdf-1.2.ebuild, mupdf-9999.ebuild:
+  Static builds, static openjpeg, desktop file.
 
   08 Jun 2013; Patrick Lauer <patrick@gentoo.org> metadata.xml:
   Remove unneeded useflag description from metadata
diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index b6ee17f46f4b..7390d1fa7a25 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX mupdf-1.0-zoom.patch 355 SHA256 e079ab9c832feb80f0669353606d665378188355bc699a0431241a303ad421a4 SHA512 ee1f6d8f174563454a6cae5e8a8e5c1f6aad237bd5a91d264510d7d939b44c165527b1daf3e5e10b31e4984bbbe8eb75dfa8a89ffff1dc465f96687e4dbc9706 WHIRLPOOL 13d2a509eec81dfe9474435428acb193fe37fe2e9cab6b5ba3df603fddfde4667c9fee67cf9d8ad0b5d48302b2f465c1be77f4230d5a3628e9306aa5cf873cbf
 AUX mupdf-1.1_p20121127-buildsystem.patch 638 SHA256 a069157b29f15d9e7efd904ce4b3558b397889be2e8982cc51b6272e3e7e73e1 SHA512 b4d65c3df3cf32241b5bd6296a62a62750a33535f2bab5acc2fbbe2f3deb8420cbab335c74b6d50898f2edc101a28cec23d70f2ae1f720d2a5a62b7e6da2dbc9 WHIRLPOOL 1d57cf9126be7590fe1fd03b63f3b92335b20921958a754a69f79801a8bbef74d9e68f38f97e2ee232c0ed4fc552f845e3af248b38952ea978076ea4d634f9f3
 AUX mupdf-1.1_p20121127-desktop-integration.patch 413 SHA256 b32f6a4a403e887935b6a0eb9f79f960b709601d31c695b5f6200b004c070f53 SHA512 6198c6d9beae6375dad4a3ca475eceadc6e98237e7d6f84de34170db00d61214c858eebc43e252a356f2515e4a573f2f8d895ad19e7fa4681fbf151ae457c390 WHIRLPOOL c1b991f6c24417e9130ee08bb6f024282795b801fabb76ca46fe6016cc5656e610f762253d824a9591ec99bc4a44d655435e4be11a976d88038e7809569583a5
@@ -5,7 +8,7 @@ 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-9999-buildsystem.patch 251 SHA256 c2fc5eb9e09527385dd73ced61bf4e5ce0102ee0fac71d64165b582c086c1f21 SHA512 6563e8e28e713e605c1b180903c1097e54d7e35780e0f6b08d7ff86420d707a21ac59262bd34fd69f5fb458d34fb346f2e0f8fcc15bbcfb20199d3d34162a423 WHIRLPOOL 55c3035f21fbf484db631e4db09590611c134540db1859206c8b3930009ac57492a77056dd9b4134244434b334a56024cb1ac9c24bbc22205ab1a361d1482040
-AUX mupdf-9999-openjpeg2.patch 793 SHA256 fa1b89286086d33bebe7c9c230211801f81356b9dea584cf490a8c51e97ded43 SHA512 9734f730568231d4c21411d452086bbccd127449f5a8ade22ff6d51dd9d434b2d0604f51dd86d95c4800063f5c6d7c6e1ca9e779f60a720e9eec28007c1fd9d0 WHIRLPOOL de7c654898c1c7028ccb79b0d0845669c908e141eecdc403aa599a1c7b90e70f049a61bfb390b2c595e974bb0518c2f07f0a1081bb2e034c8abce517d51a67e6
+AUX mupdf-9999-openjpeg2.patch 845 SHA256 318a9e3afcb3237ae6a510c3af6261bcc30d8e9375b113109a05df5347ab6429 SHA512 f5efafc06dbb2a53d4f039f86aa09c677a0e8cbfeda93b00374749706212a3889191276c9b239cb1dee176d92fdc7ab83bbee8ec52353e7959dd1fcd7ef5f9b4 WHIRLPOOL bebd3288fd1269492c0bd88c8e58c04a78a9f8a312f243b3e01db03c833f2e9beb00f1038d23492cf42d91c3406ca1e0289c6d07312cfae7abe5eb983c004982
 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
@@ -13,7 +16,14 @@ DIST mupdf-1.2-source.zip 13808821 SHA256 9bc9e31ec27c091dad37f70940bd799e46ab6d
 EBUILD mupdf-1.0.ebuild 1515 SHA256 3b298f1cfe6a01d665a14062604e40bbc823fee8df6e4df88e4b9b78f34f22c1 SHA512 1e1573066e2fdb1737d71d963452bada81ec68418a7d32afa2a71e941937781e1e9fef27cf0bc90eac23de62ddf7d12f841bf6ddf389ec042e341e9d5c5184fc WHIRLPOOL 5f09a7019e62a5d83ec7027cb7baa681604bc8ac0b9c7e3539b86d50f060c251157209223a537b371548ab64a9e6d3bb08de424f3d2b50461fdba7d149c3b070
 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 2834 SHA256 271d4d24a467d0ae78c4558c16485b0d5c7ed492f3af5cce7ff5872d1b6ca9bd SHA512 5ab936bf32c6993d6463a9f178cd113f5ef36febc7607459127732117b82051837677eeca134894096ee98b3572d3d3e65523879c4e46a368e87531b804fac83 WHIRLPOOL b3e9bef101c8b71a08f585f9301872ccc4ef293d26a491469875d08f3e8d521f5a8b96330b779bd4c4ec0b526e7543d3341925dd4139aa2bb563b5f0efb54467
-EBUILD mupdf-9999.ebuild 2663 SHA256 8fc048bbee3cb22445a058603f77aeba06cca61529b02bc67e837a56d98ff57d SHA512 54b7c05211cd60a900b41fc5506a97eeba94ac8a6f4a2ebfcf2357f7663a0ca28b5b6b6a1178b9a31be15e89323a25f700863e8175acff93e85e8dd7518afba2 WHIRLPOOL e184c5502a9344d496d1d72fb713a98e28f8010df3b887a45a1f57c034db59646ebe42ee6b141ce2e5e0689aef62fcf429e7be876ece7f8ab788b4a85cfd709b
-MISC ChangeLog 11210 SHA256 7b89f070015bfe1e3e1681879380c3c9cf4684ed5df4e86cbda63f83ce50ef21 SHA512 2515b62e0b055c15c7de312a58360a9d3abb4e05ae254e77050383876acb592348804147c1aed449488d74a4cf178f96b65eb8cc4a155d70dde380c2c9fab533 WHIRLPOOL 3ab16e5c2a7d72d7240b241892509595c627bc77326457dbad86dd00bd568d3d296c007f8a22b0f72a367791f69a12092791d8a8088d736531d313db80ce48a9
+EBUILD mupdf-1.2.ebuild 3019 SHA256 a979ac3fd4e413c3bc961cb0e7fb194245a20d2068ff34fcb2edf45fdc31ab9c SHA512 d9aa484e9ab1297ac4f9425a411553010ce712e6022d2510c2e2cc44b30b50e29a6ca59793ca692e1546d89ffc878100a642ca13dcb643ac557ff3438c905c8b WHIRLPOOL 29933167490173907d4c13bcd76fca29827b5dcaab99610d71997cf0bfa6f18950eead044ca1e9a9c59cee646015875fa588cb9afb5f87ae37edb53a6b3bc047
+EBUILD mupdf-9999.ebuild 3021 SHA256 f4c2176b2f5d61aff8884f5c7f18d469d73dc4d8714fa009582e6637edf389b5 SHA512 0eb270c6131b9c2172c96cee967a700707a05767f735f51453064408bcc44ba69ccd74932ce60b23bc1285c54a17d4aa78efe332a4cfa3b5395e4486cd3cdeb1 WHIRLPOOL 7af96c254bb8bf05ede3314f3c4a78f0e132d57e499563c986fc2913c5ccdb155a0d305a59a9ae668c90043452af5004a6d87a2a436eff69b6a0b7ff214ab691
+MISC ChangeLog 11374 SHA256 4f3925f0696e8dcbca3b0018e38b4ca92586e09d4c7e27a99f39752050ab43e1 SHA512 403a1ec4f1d0e417a014561c9eaa03872cd18361470891674f3fde98655f652d17510ac3fd3f7ff7c614b79440748d67420055d09975ec2c69140b5b31b5bc76 WHIRLPOOL f74304f9a6acc54773b2679a66651896fb2b2de3dfd06878b2939a7508e5accb24f11cd261af8f34866d37c97c4d3fe760f64ebcc3047e6f6348745c7d47d793
 MISC metadata.xml 224 SHA256 f810c6de744adceee241992d3f713142db3e7025986f6cc5898cfe3c9cb2f4a7 SHA512 4f78d959809ec0db2f9be2a7747d572fa8ee03d177044dd46574881a6ee83736510b76062c12daecae609282d197ba466e8a3e3a654b1383e04c659acd41bef5 WHIRLPOOL 0300a228d371c918b051bc24859dfe4e5d0d2a71b80f697f202749c5aca69efcee4be6e69454c9abfa4ced28e19a9d1f71d6d7eaf54290b8d03b5c04fd209868
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.20 (GNU/Linux)
+
+iF4EAREIAAYFAlGzFyIACgkQknrdDGLu8JBqHAD/cPHD/jyJcaKOTlwtQqC66KP3
+PpejpFBQVQpZVSbJ98gA/3U8mkcU+AUNkBFqf3B8h2M810dAoAMzwLsyeSkEWes8
+=eA1h
+-----END PGP SIGNATURE-----
diff --git a/app-text/mupdf/files/mupdf-9999-openjpeg2.patch b/app-text/mupdf/files/mupdf-9999-openjpeg2.patch
index 7963326837ee..6c4cfd6c128e 100644
--- a/app-text/mupdf/files/mupdf-9999-openjpeg2.patch
+++ b/app-text/mupdf/files/mupdf-9999-openjpeg2.patch
@@ -1,3 +1,5 @@
+http://bugs.ghostscript.com/show_bug.cgi?id=693518
+
 --- mupdf-9999/Makerules
 +++ mupdf-9999/Makerules
 @@ -52,8 +52,8 @@
diff --git a/app-text/mupdf/mupdf-1.2.ebuild b/app-text/mupdf/mupdf-1.2.ebuild
index 52da14f6b70f..81be0f3bbfa9 100644
--- a/app-text/mupdf/mupdf-1.2.ebuild
+++ b/app-text/mupdf/mupdf-1.2.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-1.2.ebuild,v 1.4 2013/06/07 22:52:15 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-1.2.ebuild,v 1.5 2013/06/08 11:31:51 xmw Exp $
 
 EAPI=5
 
@@ -15,20 +15,21 @@ SLOT="0/1.2"
 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="X vanilla static static-libs"
 
-RDEPEND="media-libs/freetype:2
-	media-libs/jbig2dec
-	>=media-libs/openjpeg-1.5:0
-	virtual/jpeg
-	X? ( x11-libs/libX11
-		x11-libs/libXext )"
+LIB_DEPEND="media-libs/freetype:2[static-libs?]
+	media-libs/jbig2dec[static-libs?]
+	>=media-libs/openjpeg-1.5:0[static-libs?]
+	virtual/jpeg[static-libs?]
+	X? ( x11-libs/libX11[static-libs?]
+		x11-libs/libXext[static-libs?] )"
+RDEPEND="${LIB_DEPEND}"
 DEPEND="${RDEPEND}
-	static? ( app-arch/bzip2[static-libs]
-		media-libs/freetype:2[static-libs]
-		media-libs/jbig2dec[static-libs]
-		virtual/jpeg[static-libs]
-		X? ( x11-libs/libX11[static-libs]
-			x11-libs/libXext[static-libs] )	)
-	virtual/pkgconfig"
+	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
 
@@ -52,7 +53,7 @@ src_prepare() {
 		-e "\$aprefix = ${ED}usr" \
 		-e "\$alibdir = ${ED}usr/$(get_libdir)" \
 		-i Makerules || die
-	
+
 	if ! use X ; then
 		sed -e "\$aNOX11 = yes" \
 			-i Makerules || die
@@ -60,9 +61,11 @@ src_prepare() {
 
 	if use static-libs || use static ; then
 		cp -a "${S}" "${S}"-static || die
-		sed -e '/^LIBS +=/s: -lopenjpeg : :' \
-			-e '/^LIBS +=/s:=\(.*\):= -Wl,-Bstatic \1 -lbz2 -Wl,-Bdynamic -lopenjpeg:' \
-			-i "${S}"-static/Makefile
+		sed -e 's:\(pkg-config --libs\):\1 --static:' \
+		    -e '/^X11_LIBS :=/s:\(.*\):\1 -lbz2 -ldl -lpthread:' \
+			-i "${S}"-static/Makerules || die
+		sed -e '/^LIBS +=/s:\(-lfreetype\):\1 -lbz2:' \
+			-i "${S}"-static/Makefile || die
 	fi
 
 	my_soname=libfitz.so.1.2
@@ -77,29 +80,30 @@ src_compile() {
 	use static-libs && \
 		emake -C "${S}"-static build/debug/libfitz.a
 	use static && \
-		emake -C "${S}"-static
+		emake -C "${S}"-static XLIBS="-static"
 }
 
 src_install() {
 	if use X ; then
 		domenu debian/mupdf.desktop
 		doicon debian/mupdf.xpm
-		use static && dobin "${S}"-static/build/debug/mupdf
 	else
 		rm apps/man/mupdf.1
 	fi
 
 	emake install
 	dosym ${my_soname} /usr/$(get_libdir)/libfitz.so
-	
+
 	use static-libs && \
 		dolib.a "${S}"-static/build/debug/libfitz.a
-	use static && \
+	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
 
diff --git a/app-text/mupdf/mupdf-9999.ebuild b/app-text/mupdf/mupdf-9999.ebuild
index 41e01b890356..c13c287ff25c 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.29 2013/06/07 22:52:15 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-9999.ebuild,v 1.30 2013/06/08 11:31:51 xmw Exp $
 
 EAPI=5
 
@@ -16,20 +16,22 @@ SLOT="0/1.2"
 KEYWORDS=""
 IUSE="X vanilla static static-libs"
 
-RDEPEND="media-libs/freetype:2
-	media-libs/jbig2dec
-	media-libs/openjpeg:2
-	virtual/jpeg
-	X? ( x11-libs/libX11
-		x11-libs/libXext )"
+LIB_DEPEND="dev-libs/openssl[static-libs?]
+	media-libs/freetype:2[static-libs?]
+	media-libs/jbig2dec[static-libs?]
+	>=media-libs/openjpeg-1.5:0[static-libs?]
+	virtual/jpeg[static-libs?]
+	X? ( x11-libs/libX11[static-libs?]
+		x11-libs/libXext[static-libs?] )"
+RDEPEND="${LIB_DEPEND}"
 DEPEND="${RDEPEND}
-	static? ( app-arch/bzip2[static-libs]
-		media-libs/freetype:2[static-libs]
-		media-libs/jbig2dec[static-libs]
-		virtual/jpeg[static-libs]
-		X? ( x11-libs/libX11[static-libs]
-			x11-libs/libXext[static-libs] )	)
-	virtual/pkgconfig"
+	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
@@ -41,6 +43,10 @@ src_prepare() {
 	use vanilla || epatch \
 		"${FILESDIR}"/${PN}-1.1_rc1-zoom-2.patch
 
+	#http://bugs.ghostscript.com/show_bug.cgi?id=693467
+	sed -e '/^Actions=/s:=.*:=View;:' \
+		-i debian/${PN}.desktop || die
+
 	sed -e "\$aOS = Linux" \
 		-e "\$aCC = $(tc-getCC)" \
 		-e "\$aLD = $(tc-getCC)" \
@@ -50,7 +56,7 @@ src_prepare() {
 		-e "\$aprefix = ${ED}usr" \
 		-e "\$alibdir = ${ED}usr/$(get_libdir)" \
 		-i Makerules || die
-	
+
 	if ! use X ; then
 		sed -e "\$aNOX11 = yes" \
 			-i Makerules || die
@@ -58,9 +64,11 @@ src_prepare() {
 
 	if use static-libs || use static ; then
 		cp -a "${S}" "${S}"-static || die
-		sed -e '/^LIBS +=/s: -lopenjpeg : :' \
-			-e '/^LIBS +=/s:=\(.*\):= -Wl,-Bstatic \1 -lbz2 -Wl,-Bdynamic -lopenjpeg:' \
-			-i "${S}"-static/Makefile
+		#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=libfitz.so.1.2
@@ -75,29 +83,30 @@ src_compile() {
 	use static-libs && \
 		emake -C "${S}"-static build/debug/libfitz.a
 	use static && \
-		emake -C "${S}"-static
+		emake -C "${S}"-static XLIBS="-static"
 }
 
 src_install() {
 	if use X ; then
 		domenu debian/mupdf.desktop
 		doicon debian/mupdf.xpm
-		use static && dobin "${S}"-static/build/debug/mupdf
 	else
 		rm apps/man/mupdf.1
 	fi
 
 	emake install
 	dosym ${my_soname} /usr/$(get_libdir)/libfitz.so
-	
+
 	use static-libs && \
 		dolib.a "${S}"-static/build/debug/libfitz.a
-	use static && \
+	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