Version bump

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

5 files changed, 155 insertions, 2 deletions

diff --git a/app-text/mupdf/ChangeLog b/app-text/mupdf/ChangeLog
index f04edcc847ab..ae91d8841006 100644
--- a/app-text/mupdf/ChangeLog
+++ b/app-text/mupdf/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/mupdf
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/ChangeLog,v 1.10 2011/02/20 10:26:00 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/ChangeLog,v 1.11 2011/03/29 14:03:25 xmw Exp $
+
+*mupdf-0.8.15 (29 Mar 2011)
+
+  29 Mar 2011; Michael Weber <xmw@gentoo.org> +mupdf-0.8.15.ebuild,
+  +files/mupdf-0.8.15-buildsystem.patch, +files/mupdf-0.8.15-zoom.patch:
+  Version bum, thanks to shark@bitchx.it for the hint on bug 360455, added
+  vanilla useflag to disable zoom-patch
 
   20 Feb 2011; Kacper Kowalik <xarthisius@gentoo.org>
   mupdf-0.7_p20110212.ebuild:
diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index 5051e97ee646..faced4dc31c6 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -2,10 +2,14 @@ AUX mupdf-0.7-buildsystem.patch 1111 RMD160 9246a80c1cedf49dc39b694e9913f98f295d
 AUX mupdf-0.7-zoom.patch 1632 RMD160 e55baa3b3dcf4e712a4844b4d4e3d11642279cac SHA1 e0685ec90ee7c1c68b58bc519b2844df521c14ba SHA256 261b9eb9125ef3bb96643c9a94146d48da6d0d7a14d67447f503bf4648db4c3e
 AUX mupdf-0.7_p20110212-buildsystem.patch 456 RMD160 1e7352cead17011e12e8e1cc8e9482434f07f56c SHA1 3bf7eff144e45fd7ba7871e86e97af19db9d1f32 SHA256 f4e5d00efdbb244cff75a19d851b01d0a1dd969e95b52086232961d97a59138e
 AUX mupdf-0.7_p20110212-zoom.patch 1540 RMD160 71f21318124b4c3926d469b2387dce07cae1051f SHA1 034f401e4ca5fd816c7240e5cd6b83b63c775c1e SHA256 ddd3901fcf492f5092c8ea4bfa6846b927a58efbaa3fd0a566bffb0abbfa4ff6
+AUX mupdf-0.8.15-buildsystem.patch 424 RMD160 86c2353b985e1a767c32304c82461ee29bd8f6b0 SHA1 0c28884a67d9ed3711f4df4ab6919f37c3da3e41 SHA256 41933115b462466690b05985a1e1b0cda6194ac5a5753947d378c6d9773d1314
+AUX mupdf-0.8.15-zoom.patch 1287 RMD160 8c449b6586047318bf76ac0a125fd4322f4b5f60 SHA1 50130736687209a892557aebb69ace88ab656f91 SHA256 62a25b7342853bbac783b58c7339b3c6b85a77e20d378e239b55a46d9cacb114
 DIST mupdf-0.7.tar.gz 3557621 RMD160 82723652fb967be7665cfc55f4b2bb7c3ff55b69 SHA1 3e97cefa9a65b770cc1be7584d6a5da9dc064d84 SHA256 e7f6307fa472575d27fe893e787ddb3fc927f03ba4ae23105f917189e81960a6
 DIST mupdf-0.7_p20110212.tar.bz2 3479486 RMD160 1c862e6534b473911ff0994d4634840923bfe12d SHA1 498f3e13f390c06287a716d1a3f779a1ec987a62 SHA256 8c95398c8f8a296e7b0c7d490222d65b08cb1d1ad941f32428aa03a031bcd2f1
+DIST mupdf-0.8.15-source.tar.gz 3837265 RMD160 0bd7e493f193f44a963e30e57d449e3503ebf7c7 SHA1 2e0f81cb99246638499995ebce79abd7c075061c SHA256 c9e7acc86c208a854e460cd07c1132039a95df0c21aa5052c4481fb540b0e03e
 EBUILD mupdf-0.7-r1.ebuild 1521 RMD160 117f4292a1a35882cc87b77f2e720bf21f67364e SHA1 4da21277f2872749a05f0643810356e6aa6a042e SHA256 2d33215a1de0f16e700767d2e7ce97fb4c61fdb4a67cef8aa5f4bdfa71bc0e41
 EBUILD mupdf-0.7_p20110212.ebuild 1516 RMD160 d401061b1b3036b6c0b271121af82805ff77b2ca SHA1 210e49cebde305c258aa61349fa042b8550b3632 SHA256 15fae02e083ffdbfeb9f9827d7dc51aa2350f7930dc74f357c5582bf489d6166
+EBUILD mupdf-0.8.15.ebuild 1492 RMD160 d5febe1926e90fd912a7298d1f233bf5bbd49128 SHA1 8bb9716e6bcc35cca46f0ad8be3e5b9140368893 SHA256 fffa184182a77f87c9145e1a8d50ebce62cf60cc2ea57cb16970f8704ba6ec85
 EBUILD mupdf-9999.ebuild 1553 RMD160 0288a1dcb2c24f731f6ad0821f8324118f3737b5 SHA1 0a13786ca6677f308258fa26b693acf2844a23d0 SHA256 bf9f23b43129d6a6afb5824f6cbbcdddba552f2e5b9726a9c0a3776e167028db
-MISC ChangeLog 2033 RMD160 aea4ed20eea877c83b176b69f705b5a9708d6d36 SHA1 9dddfc6bf41b50eb479a0e84501a28e2bee084ec SHA256 62dbae44bc45d53dc5fb43c4b9dcd1214651f845c677c9d97d11de4a499a7c55
+MISC ChangeLog 2312 RMD160 bca44644c54001bcc3ea68dafac12319d9c7bd8a SHA1 09f96f53642b6de5aff628f92a74372f1f80e22d SHA256 e7337ec69c2730e712d41365184c02e2ca7b7889629038dffec25479260b7e67
 MISC metadata.xml 245 RMD160 6b03982a4d5f32d9fa6b9259ae36f9fcb07c8404 SHA1 fb16c7b4c5ab071dd979f761b8bb075f5396b737 SHA256 375a1da02cd2c393ce2378a73c1ce08134bc030b3bb378c6a4d6ca9cd5be1f8d
diff --git a/app-text/mupdf/files/mupdf-0.8.15-buildsystem.patch b/app-text/mupdf/files/mupdf-0.8.15-buildsystem.patch
new file mode 100644
index 000000000000..631cf67be90d
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-0.8.15-buildsystem.patch
@@ -0,0 +1,24 @@
+--- Makerules
++++ Makerules
+@@ -7,10 +7,10 @@
+ CFLAGS ?=
+ LDFLAGS ?=
+ 
+-CFLAGS += -Ifitz -Imupdf -Wall
++CFLAGS += -Ifitz -Imupdf
+ 
+ ifeq "$(build)" "debug"
+-CFLAGS += -pipe -g
++CFLAGS += 
+ endif
+ 
+ ifeq "$(build)" "profile"
+@@ -28,7 +28,7 @@
+ 
+ ifeq "$(OS)" "Linux"
+ SYS_FREETYPE_INC := `pkg-config --cflags freetype2`
+-X11LIBS := -lX11 -lXext
++X11LIBS := `pkg-config --libs x11 xext`
+ PDFVIEW_EXE = $(X11VIEW_EXE)
+ endif
+ 
diff --git a/app-text/mupdf/files/mupdf-0.8.15-zoom.patch b/app-text/mupdf/files/mupdf-0.8.15-zoom.patch
new file mode 100644
index 000000000000..ccb4a39f3429
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-0.8.15-zoom.patch
@@ -0,0 +1,57 @@
+--- mupdf-0.8.15.orig/apps/man/mupdf.1
++++ mupdf-0.8.15/apps/man/mupdf.1
+@@ -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
+--- mupdf-0.8.15.orig/apps/pdfapp.c
++++ mupdf-0.8.15/apps/pdfapp.c
+@@ -661,6 +661,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);
+@@ -784,6 +798,7 @@
+ 		break;
+ 
+ 	case 'b':
++	case '\b': //backspace
+ 		panto = DONT_PAN;
+ 		if (app->numberlen > 0)
+ 			app->pageno -= atoi(app->number);
+@@ -792,6 +807,7 @@
+ 		break;
+ 
+ 	case ' ':
++	case 'f':
+ 		panto = DONT_PAN;
+ 		if (app->numberlen > 0)
+ 			app->pageno += atoi(app->number);
diff --git a/app-text/mupdf/mupdf-0.8.15.ebuild b/app-text/mupdf/mupdf-0.8.15.ebuild
new file mode 100644
index 000000000000..7d5bbd860434
--- /dev/null
+++ b/app-text/mupdf/mupdf-0.8.15.ebuild
@@ -0,0 +1,61 @@
+# 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-0.8.15.ebuild,v 1.1 2011/03/29 14:03:25 xmw Exp $
+
+EAPI=2
+
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="a lightweight PDF viewer and toolkit written in portable C"
+HOMEPAGE="http://mupdf.com/"
+SRC_URI="http://mupdf.com/download/${P}-source.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="X vanilla"
+
+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}"/${P}-buildsystem.patch
+
+	use vanilla || epatch "${FILESDIR}"/${P}-zoom.patch
+}
+
+src_compile() {
+	local my_pdfexe=
+	use X || my_pdfexe="PDFVIEW_EXE="
+
+	emake build=debug ${my_pdfexe} CC="$(tc-getCC)" verbose=true -j1 || die
+}
+
+src_install() {
+	emake build=debug ${my_pdfexe} prefix="${D}usr" \
+		LIBDIR="${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 apps/man/mupdf.1 || die
+	fi
+	doman apps/man/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"
+}