Revision bump to add zoom keys and fix documentation issues

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

4 files changed, 138 insertions, 2 deletions

diff --git a/app-text/mupdf/ChangeLog b/app-text/mupdf/ChangeLog
index ff22f048f604..a6f457f3a4af 100644
--- a/app-text/mupdf/ChangeLog
+++ b/app-text/mupdf/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/mupdf
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/ChangeLog,v 1.2 2010/08/30 12:03:38 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/ChangeLog,v 1.3 2010/09/09 00:36:57 xmw Exp $
+
+*mupdf-0.7-r1 (09 Sep 2010)
+
+  09 Sep 2010; Michael Weber <xmw@gentoo.org> +mupdf-0.7-r1.ebuild,
+  +files/mupdf-0.7-zoom.patch:
+  Revision bump to add zoom keys and fix documentation issues.
 
 *mupdf-0.7 (30 Aug 2010)
 
diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index 1fd174711769..24fa76749704 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -1,8 +1,10 @@
 AUX mupdf-0.6-buildsystem.patch 1446 RMD160 dbc139d01e47658a2339b6b8b65fe9fa8bfd9870 SHA1 0f4d9b7b47a24590623ef606ffbd6b878b2327a0 SHA256 bf6c539e530fe30f0bfb4c1c3f0e916d07ac18f035764e5afaf6b280c900b06f
 AUX mupdf-0.7-buildsystem.patch 1111 RMD160 9246a80c1cedf49dc39b694e9913f98f295d6a93 SHA1 17b2691984e799d423d7b90544df15fff054c70a SHA256 bd4dae8cd56579cd873654bf804a26cbad92a4b827673f04ab7a3d16e01d21b9
+AUX mupdf-0.7-zoom.patch 1632 RMD160 e55baa3b3dcf4e712a4844b4d4e3d11642279cac SHA1 e0685ec90ee7c1c68b58bc519b2844df521c14ba SHA256 261b9eb9125ef3bb96643c9a94146d48da6d0d7a14d67447f503bf4648db4c3e
 DIST mupdf-0.6.tar.gz 3607245 RMD160 50b1ed1c3c07613a1dbb19cfe63cb47d4f2ae2fe SHA1 dd501da6f50c686c6d519fe6ae7c951d2e2d7e1c SHA256 6f87c4f113ee9e0f4bdfd3a316ef44052edc4febc8f7b531c4a3f44ffe149605
 DIST mupdf-0.7.tar.gz 3557621 RMD160 82723652fb967be7665cfc55f4b2bb7c3ff55b69 SHA1 3e97cefa9a65b770cc1be7584d6a5da9dc064d84 SHA256 e7f6307fa472575d27fe893e787ddb3fc927f03ba4ae23105f917189e81960a6
 EBUILD mupdf-0.6.ebuild 1505 RMD160 fc8559615f965b09960f42421fe4922e0971d555 SHA1 d12d6bb8889a7abf07ebb9cdb152c17eb502ed03 SHA256 bc69f17c8475bba04af6ac325ae312af1074eac6309d1ef103e47388ae5ad99c
+EBUILD mupdf-0.7-r1.ebuild 1521 RMD160 2d1aa75d6acdb22bb7ec71096154a083b4f25035 SHA1 f434b5df259c78e060d3b994a384e31925a0ffe0 SHA256 c6522c690fa5e40344537a3ae59e8da5edf60f7100ef6cebf8dc497a5de38ad5
 EBUILD mupdf-0.7.ebuild 1424 RMD160 fd39a6636df7f48898f626adc4b99481908112e7 SHA1 a0ee3a173db5a49e596464cd02c61624d6353077 SHA256 01804ddb7108013a3f6f0c56b2e942fc70954b90a660bd4eca1c35343cc7c4aa
-MISC ChangeLog 668 RMD160 277217a09bdc3d0398b1a00167046caf1afc5a83 SHA1 09a163b6bfafc5461484ed0cfa1e9f979bed1e5c SHA256 4521dffc1e7b48888c8c80ab59479bcb862c8464e9856e8efb81cc5f40e49694
+MISC ChangeLog 860 RMD160 83c6475bb7b5518675a7fe27e05f7de8bac52724 SHA1 15dd30b9ca7bc811d059777372588de938af0165 SHA256 8e829748691ff0cd588c32b7cb9969dc642156c09e2ce4fc94da2da90a16c4bf
 MISC metadata.xml 245 RMD160 6b03982a4d5f32d9fa6b9259ae36f9fcb07c8404 SHA1 fb16c7b4c5ab071dd979f761b8bb075f5396b737 SHA256 375a1da02cd2c393ce2378a73c1ce08134bc030b3bb378c6a4d6ca9cd5be1f8d
diff --git a/app-text/mupdf/files/mupdf-0.7-zoom.patch b/app-text/mupdf/files/mupdf-0.7-zoom.patch
new file mode 100644
index 000000000000..0f33e2aa0743
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-0.7-zoom.patch
@@ -0,0 +1,65 @@
+Michael Weber <xmw at gentoo dot org> 09/09/2010
+
+--- apps/pdfapp.c.orig	2010-09-09 01:59:16.820000053 +0200
++++ apps/pdfapp.c	2010-09-09 02:02:32.400000054 +0200
+@@ -602,6 +602,20 @@
+ 		pdfapp_showpage(app, 0, 1);
+ 		break;
+ 
++	case '_': // zoom to default resolution
++		app->resolution = 72;
++		pdfapp_showpage(app, 0, 1);
++		break;
++
++	case 'z': // zoom to fit window
++	case 'Z': // zoom to fill window
++		if ( ( c == 'Z' ) ^ ( app->image->w * app->winh > app->winw * app->image->h ) ) 
++			app->resolution = ( app->resolution * app->winw ) / app->image->w;
++		else
++			app->resolution = ( app->resolution * app->winh ) / app->image->h;
++		pdfapp_showpage(app, 0, 1);
++		break; 
++
+ 	case 'L':
+ 		app->rotate -= 90;
+ 		pdfapp_showpage(app, 0, 1);
+@@ -725,6 +739,7 @@
+ 		break;
+ 
+ 	case 'b':
++	case '\b': //backspace
+ 		panto = DONT_PAN;
+ 		if (app->numberlen > 0)
+ 			app->pageno -= atoi(app->number);
+@@ -733,6 +748,7 @@
+ 		break;
+ 
+ 	case ' ':
++	case 'f':
+ 		panto = DONT_PAN;
+ 		if (app->numberlen > 0)
+ 			app->pageno += atoi(app->number);
+--- debian/mupdf.1.orig	2010-09-09 02:05:07.573000045 +0200
++++ debian/mupdf.1	2010-09-09 02:14:25.744000054 +0200
+@@ -1,4 +1,4 @@
+-.TH MUPDF 1 "March 15, 2010"
++.TH MUPDF 1 "September 9, 2010"
+ .\" Please adjust this date whenever revising the manpage.
+ .SH NAME
+ mupdf \- MuPDF is a lightweight PDF viewer written in portable C
+@@ -96,6 +96,15 @@
+ .B \-
+ Zoom out.
+ .TP
++.B _
++Reset zoom to default (72dpi).
++.TP
++.B z
++Zoom page size to fit into the window frame.
++.TP
++.B Z
++Zoom page size to fill the window frame.
++.TP
+ .B <
+ Rotate page counter-clockwise or left by 90\(de.
+ .TP
diff --git a/app-text/mupdf/mupdf-0.7-r1.ebuild b/app-text/mupdf/mupdf-0.7-r1.ebuild
new file mode 100644
index 000000000000..e6a2eb556bdf
--- /dev/null
+++ b/app-text/mupdf/mupdf-0.7-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-0.7-r1.ebuild,v 1.1 2010/09/09 00:36:57 xmw Exp $
+
+EAPI=2
+
+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}.com/download/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X"
+
+RDEPEND="media-libs/freetype:2
+	media-libs/jbig2dec
+	media-libs/jpeg
+	media-libs/openjpeg
+	X? ( x11-libs/libX11
+		x11-libs/libXext )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-buildsystem.patch
+
+	epatch "${FILESDIR}"/${P}-zoom.patch
+
+	sed -i -e '/CFLAGS/s: -DNDEBUG : :' Makerules || die
+}
+
+src_compile() {
+	my_pdfexe=
+	use X || my_pdfexe="PDFVIEW_EXE="
+
+	emake build=release ${my_pdfexe} CC="$(tc-getCC)" verbose=true || die
+}
+
+src_install() {
+	emake build=release ${my_pdfexe} prefix="${D}usr" \
+		libprefix="${D}usr/$(get_libdir)" verbose=true install || die
+
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins debian/mupdf.pc || die
+
+	if use X ; then
+		domenu debian/mupdf.desktop || die
+		doicon debian/mupdf.xpm || die
+		doman debian/mupdf.1 || die
+	fi
+	doman debian/pdf{clean,draw,show}.1 || die
+	dodoc README || die
+
+	# avoid collision with app-text/poppler-utils
+	mv "${D}"usr/bin/pdfinfo "${D}"usr/bin/mupdf_pdfinfo || die
+}
+
+pkg_postinst() {
+	elog "pdfinfo was renamed to mupdf_pdfinfo"
+}