Version bump, try parallel build.

Package-Manager: portage-2.1.11.9/cvs/Linux x86_64

6 files changed, 113 insertions, 10 deletions

diff --git a/app-text/mupdf/ChangeLog b/app-text/mupdf/ChangeLog
index 8b3fa1900b1a..275b44841a9f 100644
--- a/app-text/mupdf/ChangeLog
+++ b/app-text/mupdf/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-text/mupdf
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/ChangeLog,v 1.46 2012/07/04 19:34:29 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/ChangeLog,v 1.47 2012/08/09 06:25:45 xmw Exp $
+
+*mupdf-1.1_rc1 (09 Aug 2012)
+
+  09 Aug 2012; Michael Weber <xmw@gentoo.org>
+  +files/mupdf-1.1_rc1-buildsystem.patch, +files/mupdf-1.1_rc1-zoom-2.patch,
+  +mupdf-1.1_rc1.ebuild, -files/mupdf-9999-zoom-2.patch, mupdf-1.0.ebuild,
+  mupdf-9999.ebuild:
+  Version bump, try parallel build.
 
   04 Jul 2012; Michael Weber <xmw@gentoo.org> +files/mupdf-1.0-zoom.patch,
   +files/mupdf-9999-zoom-2.patch, -files/mupdf-9999-zoom-1.patch,
diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index 83094e9ce07b..fe61accb5864 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -1,8 +1,21 @@
+-----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-9999-zoom-2.patch 200 SHA256 c0b9d6bbe627dc12492bf91d2e742a9801580eec69c137f6474a3791b5d94191 SHA512 793ba40424a41aec2c758b7f1ae433fa2ff118f72b984b914ae3ea1734faec4d281ff59d2821ecdb077037afd0e2f5482305fe4b4102c810e602792f766271f8 WHIRLPOOL 52c5d18389f1fc9f5441d0a0f8bf6d152a4e6ef7ccd99b76d8b638a22ce967405b237373437f9297239256aaf89250217217296e5d2ed3ee3b06e46e21cdcaf1
+AUX mupdf-1.1_rc1-buildsystem.patch 521 SHA256 b98072f9fab9a687fddd2ba13a08836467b8a70bbda409a28153feca5d9c1ee6 SHA512 5ee24ce5d18c73e028f8e7e33ac9dd67fc851cb9ffbbbd55739a2252b61e58497c6231157299e2a7605144d1f1931029295d7fad1f725b81ecc1b071edbf6be1 WHIRLPOOL c27869b32d5828d1f1bffaca4b4b1615ec3c2472d4a21dbf37a174674b6b81c071841a7c33fb37c511d202d43faef3732e8d44b3214308c3581467977cac5040
+AUX mupdf-1.1_rc1-zoom-2.patch 200 SHA256 c0b9d6bbe627dc12492bf91d2e742a9801580eec69c137f6474a3791b5d94191 SHA512 793ba40424a41aec2c758b7f1ae433fa2ff118f72b984b914ae3ea1734faec4d281ff59d2821ecdb077037afd0e2f5482305fe4b4102c810e602792f766271f8 WHIRLPOOL 52c5d18389f1fc9f5441d0a0f8bf6d152a4e6ef7ccd99b76d8b638a22ce967405b237373437f9297239256aaf89250217217296e5d2ed3ee3b06e46e21cdcaf1
 DIST mupdf-1.0-source.tar.gz 4208530 SHA256 4f5e12625f7f827f6eb5606026c9a7a7dbdeaf935fcea3bc173ed8d469698ec2 SHA512 00f71288740a137fa3eb3537453f0465949a2dbc590a38651b3dd7a651dad6d0dc5070a3072988439f52729b12478cb467f202157ceb44e5a560431354567861 WHIRLPOOL b58166c37fa6ba81e946e53326dad50426886380b051943f2988657780e3c77e4970541f27ec3efc29ce6693012293bf3104dfd79dfc50f644c6f051431294f3
+DIST mupdf-1.1-rc1-source.tar.gz 3816906 SHA256 b2ad77447bb326f504ec9ce7add555f8f90ec9fdc25668a0fa8dbeb3b83f622f SHA512 38ffcd153007a3baeda7cdec1346a7bad2678a687a3535edfde41eee64125db041a31b3c4a8b26b29ce3489342d51389a8d6de8fed0d51aafa43396ebcaef6c2 WHIRLPOOL 544667a04646e2582e6920669a1df78492ed232374ede8be9ce4635cc542da45121cc79a24a86361a126203c93ccf126932338d316f2ab4d7ce22fdbdf96cc5f
 EBUILD mupdf-1.0.ebuild 1450 SHA256 adb98f309fc176c11b733031fd5ff0393b1701431e4b56479757f05879ba72b5 SHA512 1b4c633ac1c2435938cbdee929655fd73325d0d6de1352e8562a9df862d7273b14e79fb2a254c54120d4002ac9e3e0213c6b1de0d17ac8170132b2393b4429bf WHIRLPOOL 6bedc65e43befc455de654406ec6b872f749aac33371e1cb132c7c2b658787557c3e1d1e02143f3225291122e452d7792755031cd9192bcc7f5b41e081d9a236
-EBUILD mupdf-9999.ebuild 1375 SHA256 78877fd72b1b35546e7594d79985f302e42e79abdf31199cd7610a2eb66b8f01 SHA512 82da42a73eb9054a22a857a381669426d37eb8a9671b2b5522385c8c8200155df70ed7c9999b26e0a3e82b387608e60b4dc66da63a3f1f911d76e39e8ac39e90 WHIRLPOOL 4ffaa345183df25d39263389b5daf55d1d355084bc41d3b251af3ce93b9a61df3cfa49121d3e0d54009c113e9e06a8f6a67824bad7ed364f814077e059ddb680
-MISC ChangeLog 7640 SHA256 b6a7c6dce79cdb506c6b621329a08e6dd6b0c06f4872fc64cb652d7a10731601 SHA512 26c9b1e80718816e8dbc144cd5ca292dfc9b1a60bd69ef6bd78da0c35891c9960228677123a6a4c5e49751d4d6fc4ff97e2c0becaeb6179a01ef40ade65c09b0 WHIRLPOOL bd93fd0fe290120699d378240d54a736e8bc4836fb883216959f7ac6821a0db954793fa34e832bb4f6ebc6230971983ad743cbcc1ff9df6e260b9bed51eef3c3
+EBUILD mupdf-1.1_rc1.ebuild 1471 SHA256 891ff3be7fd27e03a8d75e93e7168add3c062d3585e6e69bfe620a42fcd312e1 SHA512 887356ee3d1dfd70494e21a789be4c58da83bd86578dccc28423babb92fefc56832d3fbe0def473d962a4933227cc81d9b138a0cf1c769b7ad1b45b3f1142b1f WHIRLPOOL c601abbb442569c3a251e2b0c7e6a21e7e135cb98a2b02d3fd055600af7d9197e3164533ef613fee22ca895a1aefc17b7305413245ab092665c1f436a3dc90a1
+EBUILD mupdf-9999.ebuild 1377 SHA256 0a854d9772be5c58f8a0db0def72f49407f88bef204bbba9ed24a5380be995b1 SHA512 727af0f5d3786760177014a2a5e9ebae4407783b83de0be62e2940797e4963945e435ef9704f3320304236f32bafb98f9265d8bfdfaf6d2ead14283f216100cc WHIRLPOOL bdbdd5a6cae18548a63b879b8d6d361dc2f80fe69541674e4e5b6acf16dee1f75f76e6ca17d2c277cdb7b06cab530a428dc58442546685f889b26d4cc4773fcf
+MISC ChangeLog 7926 SHA256 adcc596fc82c2aa4f7728abb5c6599060035d4a7d9cee8fa02263b46e936c395 SHA512 83601f90a0eb09e278818279310021d64ccb90f8463fcb51f37b6c4b773654f5ed04b201cf4d388a58804df4d3b06d62ed16379bd7e36032fdf3d119e4a0b069 WHIRLPOOL 79524fa5c278cdf1e03796009d881e5468c86578d896730d23065edfdb0e9099a743edb003787d8b21fcc9a714d2792b38f0863291206466f2406174febcab1f
 MISC metadata.xml 224 SHA256 f810c6de744adceee241992d3f713142db3e7025986f6cc5898cfe3c9cb2f4a7 SHA512 4f78d959809ec0db2f9be2a7747d572fa8ee03d177044dd46574881a6ee83736510b76062c12daecae609282d197ba466e8a3e3a654b1383e04c659acd41bef5 WHIRLPOOL 0300a228d371c918b051bc24859dfe4e5d0d2a71b80f697f202749c5aca69efcee4be6e69454c9abfa4ced28e19a9d1f71d6d7eaf54290b8d03b5c04fd209868
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iF4EAREIAAYFAlAjV58ACgkQknrdDGLu8JC41QD+J9nnSbzKOcNkykt0WZ3M0m4Q
+n2vzR2kvCFEYv4eIsNcA/0ZHuQACoRjGZ1gJWuHGBwPomY+9KHbWlO183cMcurrO
+=pi/3
+-----END PGP SIGNATURE-----
diff --git a/app-text/mupdf/files/mupdf-1.1_rc1-buildsystem.patch b/app-text/mupdf/files/mupdf-1.1_rc1-buildsystem.patch
new file mode 100644
index 000000000000..fc7572ebe7d4
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.1_rc1-buildsystem.patch
@@ -0,0 +1,22 @@
+--- 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
+@@ -21,8 +21,8 @@
+ endif
+ 
+ ifeq "$(OS)" "Linux"
+-SYS_FREETYPE_INC := `pkg-config --cflags freetype2`
+-X11_LIBS := -lX11 -lXext
++SYS_FREETYPE_INC := $(shell pkg-config --cflags freetype2)
++X11_LIBS := $(shell pkg-config --libs x11 xext)
+ endif
+ 
+ ifeq "$(OS)" "FreeBSD"
diff --git a/app-text/mupdf/files/mupdf-9999-zoom-2.patch b/app-text/mupdf/files/mupdf-1.1_rc1-zoom-2.patch
index c62122e01eb4..c62122e01eb4 100644
--- a/app-text/mupdf/files/mupdf-9999-zoom-2.patch
+++ b/app-text/mupdf/files/mupdf-1.1_rc1-zoom-2.patch
diff --git a/app-text/mupdf/mupdf-1.1_rc1.ebuild b/app-text/mupdf/mupdf-1.1_rc1.ebuild
new file mode 100644
index 000000000000..b1b9b2dc02c2
--- /dev/null
+++ b/app-text/mupdf/mupdf-1.1_rc1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-1.1_rc1.ebuild,v 1.1 2012/08/09 06:25:45 xmw Exp $
+
+EAPI=4
+
+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/_rc/-rc}-source.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="X vanilla"
+
+RDEPEND="media-libs/freetype:2
+	media-libs/jbig2dec
+	>=media-libs/openjpeg-1.5
+	virtual/jpeg
+	X? ( x11-libs/libX11
+		x11-libs/libXext )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${P/_rc/-rc}-source
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-buildsystem.patch
+
+	if ! use vanilla ; then
+		epatch "${FILESDIR}"/${P}-zoom-2.patch
+	fi
+}
+
+src_compile() {
+	use X || my_nox11="NOX11=yes MUPDF= "
+
+	emake CC="$(tc-getCC)" OS=Linux \
+		build=debug verbose=true ${my_nox11}
+}
+
+src_install() {
+	emake prefix="${ED}usr" libdir="${ED}usr/$(get_libdir)" \
+		build=debug verbose=true ${my_nox11} install
+
+	insinto /usr/include
+	doins pdf/mupdf{,-internal}.h
+	doins fitz/fitz{,-internal}.h
+	doins 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}
+}
diff --git a/app-text/mupdf/mupdf-9999.ebuild b/app-text/mupdf/mupdf-9999.ebuild
index fa377e6e1d9f..82642ace58cb 100644
--- a/app-text/mupdf/mupdf-9999.ebuild
+++ b/app-text/mupdf/mupdf-9999.ebuild
@@ -1,15 +1,14 @@
 # Copyright 1999-2012 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.21 2012/07/04 19:34:29 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-9999.ebuild,v 1.22 2012/08/09 06:25:45 xmw Exp $
 
 EAPI=4
 
-EGIT_REPO_URI="git://git.ghostscript.com/mupdf.git"
-
 inherit eutils flag-o-matic git-2 multilib toolchain-funcs
 
 DESCRIPTION="a lightweight PDF viewer and toolkit written in portable C"
 HOMEPAGE="http://mupdf.com/"
+EGIT_REPO_URI="git://git.ghostscript.com/mupdf.git"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -26,10 +25,10 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.0-buildsystem.patch
+	epatch "${FILESDIR}"/${PN}-1.1_rc1-buildsystem.patch
 
 	if ! use vanilla ; then
-		epatch "${FILESDIR}"/${PN}-9999-zoom-2.patch
+		epatch "${FILESDIR}"/${PN}-1.1_rc1-zoom-2.patch
 	fi
 }
 
@@ -37,7 +36,7 @@ src_compile() {
 	use X || my_nox11="NOX11=yes MUPDF= "
 
 	emake CC="$(tc-getCC)" OS=Linux \
-		build=debug verbose=true ${my_nox11} -j1
+		build=debug verbose=true ${my_nox11}
 }
 
 src_install() {