Switch to shared libs and binaries (USE=static static-libs, bug 407807), Desktop integration patch, advanced buildsystem patch for 1.0

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

9 files changed, 162 insertions, 84 deletions

diff --git a/app-text/mupdf/ChangeLog b/app-text/mupdf/ChangeLog
index 0b237157092f..d0e126a5fd4e 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.69 2013/06/07 00:11:06 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/ChangeLog,v 1.70 2013/06/07 22:52:15 xmw Exp $
+
+  07 Jun 2013; Michael Weber <xmw@gentoo.org>
+  -files/mupdf-1.0-buildsystem.patch, metadata.xml, mupdf-1.0.ebuild,
+  mupdf-1.1.ebuild, mupdf-1.1_p20121127.ebuild, mupdf-1.2.ebuild,
+  mupdf-9999.ebuild:
+  Switch to shared libs and binaries (USE=static static-libs, bug 407807),
+  Desktop integration patch, advanced buildsystem patch for 1.0
 
   07 Jun 2013; Michael Weber <xmw@gentoo.org> mupdf-1.0.ebuild,
   mupdf-1.1.ebuild, mupdf-1.1_p20121127.ebuild, mupdf-1.2.ebuild:
diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index 7f8cc995c8bf..7fde0735d57e 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -1,7 +1,6 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX mupdf-1.0-buildsystem.patch 454 SHA256 a56f4fd16512aa21dd7af91c634398ede2a8a82a148f41b91f8eb25b32fefc48 SHA512 a0a0fe9a153c55d4fc03e282ce158137c2f22f5998b1803c8c6c558731ea7f1d385e445f168580c1f136833f20031e71ed011dd741ca0f2533723750354a782b WHIRLPOOL efb79768edbe1da7d478eccadcd152cb37deac7b8b6af311e6df06f6d9cd2f7cbc78b2d0932b8c6c9adfb6c880eb04950899fb9f9683b718ae785c9d050754f2
 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
@@ -14,17 +13,17 @@ DIST mupdf-1.0-source.tar.gz 4208530 SHA256 4f5e12625f7f827f6eb5606026c9a7a7dbde
 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
-EBUILD mupdf-1.0.ebuild 1452 SHA256 e3694df235cb2d198393da8695315c7faa5bf3cfcd090b72d4f1c36ba8b91cd8 SHA512 0600ad3269c895cd74b404a24b6ea543fad5312aaeeec19a654e42aacf7cb92090d9ee6c53b2a024406a0bc1d42e838ebce6f1d02e05b0c0c1d34358dfb376c7 WHIRLPOOL 13a761276611c94c6891c01ceee20d7e09a9642f8bd031e07d671ff5657c9ec385adacc5f104c5fccaece253c4a373fa7a17189cd87561e4e029cc14c3321569
-EBUILD mupdf-1.1.ebuild 1500 SHA256 e1ad01063045545c5e1dc8d4222fab32cc5e8f3ffe6dd4ff5f20e30809ac07d2 SHA512 49651194131854fdb8292e65d51c34ea1288b89f4a866f5e77de003a71601bfa80965200d180a210ad3b09dbd5b4383a77bace98cbfb47b007764798da7df96e WHIRLPOOL bd3450354c65f46b009b8f260ef9d6a10c0204cd25f2bec6b788d0a7b77ea4ae97832e4b39cbf39b6e11b5d5d7417db1e8c66474bb7f0cefbe0f1eb4c65676e9
-EBUILD mupdf-1.1_p20121127.ebuild 1487 SHA256 7aac61a0aad7b017bc95f3e9a9b3ed0554355925060de5ab99a8b880d695182f SHA512 966db7c9a6667ababfd7cbb25d499dd96934ad6586cee0b837bc10feafc8958b3512c89252d736b744adb6305a3f184f27829c5793a2c5a4cb0439fb195c06d8 WHIRLPOOL 9d85456f86d0cf7944a40dc00fb59bb7403904584041282f66264941b79d76e2a0ae33d02eec70dc08b023b6616400010d38979f63ca60d9fb71509dd0ef1e88
-EBUILD mupdf-1.2.ebuild 1650 SHA256 2b29f428267c4061a6e0d63c64643070336f40ba5a01db5b9d35a0cf6f6e941c SHA512 d20b15f13569287855662b95239dfae03fad4af8f8e686e58fc0bf649e9d258ea7a2c83e5a31720bbe95b7d217bf5df5df6c3418d96a172e6eb49a1f1c09625f WHIRLPOOL 6b034dfe48264856dd7f1a9be4fdd678d05a91d524fac946894e74d2c16172b2da52bef35e1b288b30d5a91a0bd8ad13119dc9d11c467f6cfb695272d42d6cea
-EBUILD mupdf-9999.ebuild 1453 SHA256 9ceaf889204a205e9df71130c7c9356e4b58fb707d075626f77c0f27c39b4df0 SHA512 0f1c480e60ecb29c786a759c9c8fcd43d4ef92e23e30153edf5a65f587636e7c116b2f9a2184c73b22e3d0ebcd4ee11b527e5c89178b174899bef3e641e5763d WHIRLPOOL 6f7a555c5df9ea893908876117aca1ce16fdef46ae76fec23a7b8f3b83c97bbce3b20851028240d686786fbc07d2b642634a3390ce9bc5912a66c13a7f2db030
-MISC ChangeLog 10746 SHA256 863ba6c0bade2840eae9badf6959abb156e01f805e0a063ef2d2935ca29c5372 SHA512 8395aa88969ba8910b5e25304b949f6392d03ad271ccfb64f4a909e50ef3ba93714d03bcfd60c63b6fc3f0cee498a14f29be10dbdaed07e5040955e5f9dd6e18 WHIRLPOOL 9017ad4fb680740528d4ea0a02a19548c6c691b3d2b16d0e0a03ea3c61d0b0aeb3397f2e5c305526bc20e2541806e3f05af77de8b335680388c0271a1da484b1
-MISC metadata.xml 224 SHA256 f810c6de744adceee241992d3f713142db3e7025986f6cc5898cfe3c9cb2f4a7 SHA512 4f78d959809ec0db2f9be2a7747d572fa8ee03d177044dd46574881a6ee83736510b76062c12daecae609282d197ba466e8a3e3a654b1383e04c659acd41bef5 WHIRLPOOL 0300a228d371c918b051bc24859dfe4e5d0d2a71b80f697f202749c5aca69efcee4be6e69454c9abfa4ced28e19a9d1f71d6d7eaf54290b8d03b5c04fd209868
+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 11089 SHA256 5e4c17d1a72e90b4af501fe5c89cf820368a63c132cee721957881535091e85e SHA512 80aa58b6590eee1732a2ed495f5a95b3c290227e75f4a92ef91a065cfbc8b2b6c645db10bc79d65c41bb07cacbaf0bca4b81c538ffd0d6d95f3368ae506a1dea WHIRLPOOL b48eccb0f7e3325f09439484d2200922adbc6ce5387fbd3f04d0a9bfc759a670111a6b3b90c6a25e97b19ffda12d21e2a583b15d3b0b3c0a397e74996d29b344
+MISC metadata.xml 293 SHA256 c6122b3b934ba4efcb2101fb5a08dd25d25edd3460d604be627becb291a4d457 SHA512 9e9f20b6d1322ab0772c18e4f47c140d33cc59bd26856f098b8476f7db10df607c302685cd3f16a39a9372e2981f8e44ba975a632a8687855e5b5c5810319bb8 WHIRLPOOL a0f528d0acd09189bb6bc6acffc294e457100c40c64e6bc546953f0e9e405069011d389ef1509720debbacf07dec87bde9869782a17812a6f6910d4e19a436cb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iF4EAREIAAYFAlGxJSIACgkQknrdDGLu8JDH5wD+K6UArU1ZHWQGdHxMyfBGRg0d
-H8Pkd11+sZ0+QlFn9TAA/0HqZep2PMAezWNYdreccWzzDgDgHA5n/n3HSzTCuPRP
-=2cuP
+iF4EAREIAAYFAlGyZC4ACgkQknrdDGLu8JDefQD/fg+ee0wkKfTt+YfJhmgFZWhy
+vNF9wDEWRzQ8LrnVEIwA/i/5pmx3qkArVDSo1Ieooo/ZzC0YXmF+hCdmCZruHLRs
+=Yuds
 -----END PGP SIGNATURE-----
diff --git a/app-text/mupdf/files/mupdf-1.0-buildsystem.patch b/app-text/mupdf/files/mupdf-1.0-buildsystem.patch
deleted file mode 100644
index 6a66f3c46e55..000000000000
--- a/app-text/mupdf/files/mupdf-1.0-buildsystem.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- mupdf-1.0-source/Makerules
-+++ mupdf-1.0-source/Makerules
-@@ -6,7 +6,7 @@
- CFLAGS += -Wall
- 
- ifeq "$(build)" "debug"
--CFLAGS += -pipe -g -DDEBUG
-+CFLAGS += -DDEBUG
- else ifeq "$(build)" "profile"
- CFLAGS += -pipe -O2 -DNDEBUG -pg
- LDFLAGS += -pg
-@@ -22,7 +22,7 @@
- 
- ifeq "$(OS)" "Linux"
- SYS_FREETYPE_INC := `pkg-config --cflags freetype2`
--X11_LIBS := -lX11 -lXext
-+X11_LIBS := $(shell pkg-config --libs x11 xext)
- endif
- 
- ifeq "$(OS)" "FreeBSD"
diff --git a/app-text/mupdf/metadata.xml b/app-text/mupdf/metadata.xml
index 59acc2cc580e..04fe0fdcf03b 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="shared-libs">Build shared libraries</flag>
+</use>
 </pkgmetadata>
 
diff --git a/app-text/mupdf/mupdf-1.0.ebuild b/app-text/mupdf/mupdf-1.0.ebuild
index c1077d941424..7629bf5fc5d6 100644
--- a/app-text/mupdf/mupdf-1.0.ebuild
+++ b/app-text/mupdf/mupdf-1.0.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.0.ebuild,v 1.9 2013/06/07 00:11:06 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-1.0.ebuild,v 1.10 2013/06/07 22:52:15 xmw Exp $
 
 EAPI=4
 
@@ -27,7 +27,9 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/${P}-source
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-buildsystem.patch
+	epatch \
+		"${FILESDIR}"/${PN}-1.1_rc1-buildsystem.patch \
+		"${FILESDIR}"/${P}-desktop-integration.patch
 
 	if ! use vanilla ; then
 		epatch "${FILESDIR}"/${P}-zoom.patch
diff --git a/app-text/mupdf/mupdf-1.1.ebuild b/app-text/mupdf/mupdf-1.1.ebuild
index 034195ec6b31..450a55ed64ab 100644
--- a/app-text/mupdf/mupdf-1.1.ebuild
+++ b/app-text/mupdf/mupdf-1.1.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.1.ebuild,v 1.7 2013/06/07 00:11:06 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-1.1.ebuild,v 1.8 2013/06/07 22:52:15 xmw Exp $
 
 EAPI=4
 
@@ -27,7 +27,9 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/${P/_rc/-rc}-source
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.1_rc1-buildsystem.patch
+	epatch \
+		"${FILESDIR}"/${PN}-1.1_rc1-buildsystem.patch \
+		"${FILESDIR}"/${P}-desktop-integration.patch
 
 	if ! use vanilla ; then
 		epatch "${FILESDIR}"/${PN}-1.1_rc1-zoom-2.patch
diff --git a/app-text/mupdf/mupdf-1.1_p20121127.ebuild b/app-text/mupdf/mupdf-1.1_p20121127.ebuild
index ccfd9460210d..d14b26c05643 100644
--- a/app-text/mupdf/mupdf-1.1_p20121127.ebuild
+++ b/app-text/mupdf/mupdf-1.1_p20121127.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.1_p20121127.ebuild,v 1.6 2013/06/07 00:11:06 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-1.1_p20121127.ebuild,v 1.7 2013/06/07 22:52:15 xmw Exp $
 
 EAPI=4
 
@@ -25,8 +25,9 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-buildsystem.patch
-	epatch "${FILESDIR}"/${P}-desktop-integration.patch
+	epatch \
+		 "${FILESDIR}"/${P}-buildsystem.patch \
+		"${FILESDIR}"/${P}-desktop-integration.patch
 
 	if ! use vanilla ; then
 		epatch "${FILESDIR}"/${PN}-1.1_rc1-zoom-2.patch
diff --git a/app-text/mupdf/mupdf-1.2.ebuild b/app-text/mupdf/mupdf-1.2.ebuild
index c9f4fb434c5b..52da14f6b70f 100644
--- a/app-text/mupdf/mupdf-1.2.ebuild
+++ b/app-text/mupdf/mupdf-1.2.ebuild
@@ -1,8 +1,8 @@
 # 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.3 2013/06/07 00:11:06 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-1.2.ebuild,v 1.4 2013/06/07 22:52:15 xmw Exp $
 
-EAPI=4
+EAPI=5
 
 inherit eutils flag-o-matic multilib toolchain-funcs
 
@@ -11,9 +11,9 @@ HOMEPAGE="http://mupdf.com/"
 SRC_URI="http://${PN}.googlecode.com/files/${P}-source.zip"
 
 LICENSE="AGPL-3"
-SLOT="0"
+SLOT="0/1.2"
 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="X vanilla"
+IUSE="X vanilla static static-libs"
 
 RDEPEND="media-libs/freetype:2
 	media-libs/jbig2dec
@@ -22,6 +22,12 @@ RDEPEND="media-libs/freetype:2
 	X? ( x11-libs/libX11
 		x11-libs/libXext )"
 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"
 
 S=${WORKDIR}/${P}-source
@@ -29,37 +35,73 @@ S=${WORKDIR}/${P}-source
 src_prepare() {
 	rm -rf thirdparty || die
 
-	epatch "${FILESDIR}"/${PN}-1.1_p20121127-buildsystem.patch
-	epatch "${FILESDIR}"/${PN}-1.1_p20121127-desktop-integration.patch
-	epatch "${FILESDIR}"/${PN}-1.2-mubusy_rename_fix.patch
+	epatch \
+		"${FILESDIR}"/${PN}-1.1_p20121127-buildsystem.patch \
+		"${FILESDIR}"/${PN}-1.1_p20121127-desktop-integration.patch \
+		"${FILESDIR}"/${PN}-1.2-mubusy_rename_fix.patch
 
-	if ! use vanilla ; then
-		epatch "${FILESDIR}"/${PN}-1.1_rc1-zoom-2.patch
+	use vanilla || epatch \
+		"${FILESDIR}"/${PN}-1.1_rc1-zoom-2.patch
+
+	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
+		sed -e '/^LIBS +=/s: -lopenjpeg : :' \
+			-e '/^LIBS +=/s:=\(.*\):= -Wl,-Bstatic \1 -lbz2 -Wl,-Bdynamic -lopenjpeg:' \
+			-i "${S}"-static/Makefile
 	fi
+
+	my_soname=libfitz.so.1.2
+	sed -e "\$a\$(FITZ_LIB):" \
+		-e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname} -o \$@ \$^" \
+		-e "/^FITZ_LIB :=/s:=.*:= build/debug/${my_soname}:" \
+		-i Makefile || die
 }
 
 src_compile() {
-	use X || my_nox11="NOX11=yes MUPDF= "
-
-	emake CC="$(tc-getCC)" AR="$(tc-getAR)" OS=Linux \
-		build=debug verbose=true ${my_nox11}
+	emake XCFLAGS="-fpic"
+	use static-libs && \
+		emake -C "${S}"-static build/debug/libfitz.a
+	use static && \
+		emake -C "${S}"-static
 }
 
 src_install() {
-	emake prefix="${ED}usr" libdir="${ED}usr/$(get_libdir)" \
-		build=debug verbose=true ${my_nox11} 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 && \
+		dobin "${S}"-static/build/debug/mu{tool,draw}
+	
 	insinto /usr/include
-	doins pdf/mupdf{,-internal}.h
-	doins fitz/fitz{,-internal}.h
-	doins xps/muxps{,-internal}.h
-
+	doins pdf/mupdf-internal.h fitz/fitz-internal.h xps/muxps-internal.h
+		
 	insinto /usr/$(get_libdir)/pkgconfig
 	doins debian/mupdf.pc
 
-	if use X ; then
-		domenu debian/mupdf.desktop
-		doicon debian/mupdf.xpm
-	fi
 	dodoc CHANGES README doc/{example.c,overview.txt}
 }
diff --git a/app-text/mupdf/mupdf-9999.ebuild b/app-text/mupdf/mupdf-9999.ebuild
index 768c0ee5d9c0..41e01b890356 100644
--- a/app-text/mupdf/mupdf-9999.ebuild
+++ b/app-text/mupdf/mupdf-9999.ebuild
@@ -1,10 +1,10 @@
 # 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.28 2013/06/06 22:58:47 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-9999.ebuild,v 1.29 2013/06/07 22:52:15 xmw Exp $
 
 EAPI=5
 
-inherit eutils git-2 multilib toolchain-funcs
+inherit eutils git-2 flag-o-matic 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"
+SLOT="0/1.2"
 KEYWORDS=""
-IUSE="X vanilla"
+IUSE="X vanilla static static-libs"
 
 RDEPEND="media-libs/freetype:2
 	media-libs/jbig2dec
@@ -23,41 +23,83 @@ RDEPEND="media-libs/freetype:2
 	X? ( x11-libs/libX11
 		x11-libs/libXext )"
 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"
 
 src_prepare() {
 	rm -rf thirdparty || die
 
-	epatch "${FILESDIR}"/${PN}-9999-buildsystem.patch \
-		"${FILESDIR}"/${PN}-9999-openjpeg2.patch
+	epatch \
+		"${FILESDIR}"/${P}-buildsystem.patch \
+		"${FILESDIR}"/${P}-openjpeg2.patch
 
-	if ! use vanilla ; then
-		epatch "${FILESDIR}"/${PN}-1.1_rc1-zoom-2.patch
+	use vanilla || epatch \
+		"${FILESDIR}"/${PN}-1.1_rc1-zoom-2.patch
+
+	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
+		sed -e '/^LIBS +=/s: -lopenjpeg : :' \
+			-e '/^LIBS +=/s:=\(.*\):= -Wl,-Bstatic \1 -lbz2 -Wl,-Bdynamic -lopenjpeg:' \
+			-i "${S}"-static/Makefile
 	fi
+
+	my_soname=libfitz.so.1.2
+	sed -e "\$a\$(FITZ_LIB):" \
+		-e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname} -o \$@ \$^" \
+		-e "/^FITZ_LIB :=/s:=.*:= build/debug/${my_soname}:" \
+		-i Makefile || die
 }
 
 src_compile() {
-	use X || my_nox11="NOX11=yes MUPDF= "
-
-	emake CC="$(tc-getCC)" OS=Linux \
-		build=debug verbose=true ${my_nox11}
+	emake XCFLAGS="-fpic"
+	use static-libs && \
+		emake -C "${S}"-static build/debug/libfitz.a
+	use static && \
+		emake -C "${S}"-static
 }
 
 src_install() {
-	emake prefix="${ED}usr" libdir="${ED}usr/$(get_libdir)" \
-		build=debug verbose=true ${my_nox11} 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 && \
+		dobin "${S}"-static/build/debug/mu{tool,draw}
+	
 	insinto /usr/include
-	doins pdf/mupdf{,-internal}.h
-	doins fitz/fitz{,-internal}.h
-	doins xps/muxps{,-internal}.h
-
+	doins pdf/mupdf-internal.h fitz/fitz-internal.h xps/muxps-internal.h
+		
 	insinto /usr/$(get_libdir)/pkgconfig
 	doins debian/mupdf.pc
 
-	if use X ; then
-		domenu debian/mupdf.desktop
-		doicon debian/mupdf.xpm
-	fi
 	dodoc README doc/{example.c,overview.txt}
 }