Live cvs version for app-text/llpp

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

4 files changed, 141 insertions, 13 deletions

diff --git a/app-text/mupdf/ChangeLog b/app-text/mupdf/ChangeLog
index 510b34ac6464..50cba6c7a561 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.7 2010/11/14 23:02:18 hwoarang Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/ChangeLog,v 1.8 2011/01/31 14:45:35 xmw Exp $
+
+*mupdf-9999 (31 Jan 2011)
+
+  31 Jan 2011; Michael Weber <xmw@gentoo.org> +mupdf-9999.ebuild,
+  +files/mupdf-9999-zoom.patch:
+  Live cvs version for app-text/llpp
 
   14 Nov 2010; Markos Chandras <hwoarang@gentoo.org> mupdf-0.7-r1.ebuild:
   Stable on amd64 wrt bug #344771
diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index 9ac17acb05d7..e7c8dcf5bec0 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -1,20 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 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
+AUX mupdf-9999-zoom.patch 1540 RMD160 71f21318124b4c3926d469b2387dce07cae1051f SHA1 034f401e4ca5fd816c7240e5cd6b83b63c775c1e SHA256 ddd3901fcf492f5092c8ea4bfa6846b927a58efbaa3fd0a566bffb0abbfa4ff6
 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 1508 RMD160 b5a8d55ef08171bda0927f803a8b59244b5b5a82 SHA1 2feab92de9341ad96f5cd9ecfa1977680256eb02 SHA256 2e4f5e510b5964ea978742a2bf45e2ba3ca6cc51d7caa8591f08bcbc2a87d0b4
 EBUILD mupdf-0.7-r1.ebuild 1521 RMD160 117f4292a1a35882cc87b77f2e720bf21f67364e SHA1 4da21277f2872749a05f0643810356e6aa6a042e SHA256 2d33215a1de0f16e700767d2e7ce97fb4c61fdb4a67cef8aa5f4bdfa71bc0e41
 EBUILD mupdf-0.7.ebuild 1427 RMD160 3b569bb195e5a7d3af22ecf0aed4a74a158bb361 SHA1 1fa0f72b1023cecd609b54b373264038e6eec9c2 SHA256 f451a4a316882f744adc96ec82a2c41c05a4f82aa0fe63ed961ac111fffa8ac4
-MISC ChangeLog 1305 RMD160 567dfa9f4946c886f02d33edc1a003c46de192e0 SHA1 a93ebed5f83614502dc8979b8cbb4acdd1810ec8 SHA256 919b73242731975d87d8abc4339f1ed17c9f8d79680b5703dcccab5cbd91de9b
+EBUILD mupdf-9999.ebuild 1527 RMD160 3e820c94e32d4c62c39a158a6f28788025d381ea SHA1 6d0a7911946869d934b09c1a9b99b9de1e2a6a7f SHA256 c8c1862f8a3f6288fabb3fa021550fbd7ba3d91552dd4aae5324889b71cb3526
+MISC ChangeLog 1463 RMD160 d1c4b8b7b0a58b9664f8d9ce6a0e088ba5c9e41a SHA1 2089be8874b8fbe87fc063888283ba6c1ba2ae70 SHA256 407a710e6cb1b438535cbfee9094721a2c9bfeba130ef27bae270b42deefbd4c
 MISC metadata.xml 245 RMD160 6b03982a4d5f32d9fa6b9259ae36f9fcb07c8404 SHA1 fb16c7b4c5ab071dd979f761b8bb075f5396b737 SHA256 375a1da02cd2c393ce2378a73c1ce08134bc030b3bb378c6a4d6ca9cd5be1f8d
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAkzgapwACgkQ9/cejkQaxBCSUQCfZe/W8u169CIXKSbqIC//f4Wa
-848AoICZjkc2j+rcQXB4w03SJt3KM+eJ
-=WD21
------END PGP SIGNATURE-----
diff --git a/app-text/mupdf/files/mupdf-9999-zoom.patch b/app-text/mupdf/files/mupdf-9999-zoom.patch
new file mode 100644
index 000000000000..4576ea4407e4
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-9999-zoom.patch
@@ -0,0 +1,65 @@
+Michael Weber <xmw at gentoo dot org> 09/09/2010
+
+--- mupdf-9999/apps/pdfapp.c.orig
++++ mupdf-9999/apps/pdfapp.c
+@@ -650,6 +650,20 @@
+ 		pdfapp_showpage(app, 0, 1, 1);
+ 		break;
+ 
++	case '_': // zoom to default resolution
++		app->resolution = 72;
++		pdfapp_showpage(app, 0, 1, 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, 1);
++		break; 
++
+ 	case 'L':
+ 		app->rotate -= 90;
+ 		pdfapp_showpage(app, 0, 1, 1);
+@@ -773,6 +787,7 @@
+ 		break;
+ 
+ 	case 'b':
++	case '\b': //backspace
+ 		panto = DONT_PAN;
+ 		if (app->numberlen > 0)
+ 			app->pageno -= atoi(app->number);
+@@ -781,6 +796,7 @@
+ 		break;
+ 
+ 	case ' ':
++	case 'f':
+ 		panto = DONT_PAN;
+ 		if (app->numberlen > 0)
+ 			app->pageno += atoi(app->number);
+--- mupdf-9999/debian/mupdf.1.orig
++++ mupdf-9999/debian/mupdf.1
+@@ -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
+@@ -37,6 +37,15 @@
+ .B \+, \-
+ Zoom in or 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 w
+ Shrinkwrap window to fit the page.
+ .TP
diff --git a/app-text/mupdf/mupdf-9999.ebuild b/app-text/mupdf/mupdf-9999.ebuild
new file mode 100644
index 000000000000..69b539b7ce85
--- /dev/null
+++ b/app-text/mupdf/mupdf-9999.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2011 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.1 2011/01/31 14:45:35 xmw Exp $
+
+EAPI=2
+
+EGIT_REPO_URI="http://mupdf.com/repos/mupdf.git"
+
+inherit eutils flag-o-matic git multilib toolchain-funcs
+
+DESCRIPTION="a lightweight PDF viewer and toolkit written in portable C"
+HOMEPAGE="http://mupdf.com/"
+SRC_URI=""
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS=""
+IUSE="X"
+
+RDEPEND="media-libs/freetype:2
+	media-libs/jbig2dec
+	virtual/jpeg
+	media-libs/openjpeg
+	X? ( x11-libs/libX11
+		x11-libs/libXext )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.7-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"
+}