Version bump

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

5 files changed, 158 insertions, 5 deletions

diff --git a/app-text/mupdf/ChangeLog b/app-text/mupdf/ChangeLog
index 80225c977c81..384d135ee920 100644
--- a/app-text/mupdf/ChangeLog
+++ b/app-text/mupdf/ChangeLog
@@ -1,6 +1,12 @@
 # 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.15 2011/03/30 09:29:34 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/ChangeLog,v 1.16 2011/06/12 15:22:00 xmw Exp $
+
+*mupdf-0.8.165 (12 Jun 2011)
+
+  12 Jun 2011; Michael Weber <xmw@gentoo.org> +mupdf-0.8.165.ebuild,
+  +files/mupdf-0.8.165-buildsystem.patch, +files/mupdf-0.8.165-zoom.patch:
+  Version bump
 
   30 Mar 2011; Michael Weber <xmw@gentoo.org> -mupdf-0.7-r1.ebuild,
   -mupdf-0.7_p20110212.ebuild, -files/mupdf-0.7-buildsystem.patch,
diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index b513ff6e9fa4..22a3499986f1 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -3,15 +3,19 @@ Hash: SHA256
 
 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
+AUX mupdf-0.8.165-buildsystem.patch 488 RMD160 01672e1df7bbb3829714828ed6a5f45fa30aa578 SHA1 1c5711387b84bf751e185b427410a160c50dfd64 SHA256 3f2b801b2fcf74736916ad6268fbb186bd7d79aef9c0283de48b6f7c1412586f
+AUX mupdf-0.8.165-zoom.patch 1281 RMD160 cd4569419735c18e837821453223d27a8f6d96a5 SHA1 d8c21a355ff2dc648c33ce2e30b35b66e8b9ca49 SHA256 8215d4f9c27bf1899524046fe431890e0eb3a1390676b3ad69d97ae0eec0e3d0
 DIST mupdf-0.8.15-source.tar.gz 3837265 RMD160 0bd7e493f193f44a963e30e57d449e3503ebf7c7 SHA1 2e0f81cb99246638499995ebce79abd7c075061c SHA256 c9e7acc86c208a854e460cd07c1132039a95df0c21aa5052c4481fb540b0e03e
+DIST mupdf-0.8.165-source.tar.gz 3775041 RMD160 2fb4c6ad4e9a4dd00cc60fd635377c353823e569 SHA1 17222ebc80a482ef7cdb190d015cefd4821028dd SHA256 cfa00870ef857def5de1a8d20e5a20b21d72a5d31ce4746953539d2299cbc59e
 EBUILD mupdf-0.8.15.ebuild 1489 RMD160 f68975ba24f9b2c130e5c6ae63d3b7e36bd57bbe SHA1 49ed1c42971a8f98a7bdc82a2d61f4200a12dbac SHA256 c4065012a49d5947e824fcef70719fb46916403d16c94929419324b6d449c9f4
+EBUILD mupdf-0.8.165.ebuild 1499 RMD160 7e1af74c37b8e10d3638430abe27103da8aeb4bd SHA1 346e9d7b271c2bc49d2d85a42aa97dad41c80384 SHA256 4b7c76c271f87eb1e83000f35ba4e7130bef980b4dc09cafd1eceb044290dd8b
 EBUILD mupdf-9999.ebuild 1513 RMD160 13bd15baaac683d56d0e20b9fd47700875ac47a2 SHA1 f2f6959ca81c082be5be0c654ad607663f3912d2 SHA256 ce582b8cad89fda79a5101c6592a290641cb384962194fb2e9fa2e4798476c3a
-MISC ChangeLog 3010 RMD160 eba69a450cf9c55f8091dfa86eb0dbe5cf6b833b SHA1 9835563639c521d8a3635370fa57746777085071 SHA256 7282b45b9c0516db935cce223e8cce33501aaa70f7aabf1331434ce3cfe84a09
+MISC ChangeLog 3200 RMD160 42ef1cb63c224054fb72390d1f1e237427197f07 SHA1 857768540a0d16f8841f9b33d7dde93db38525c5 SHA256 816c72da9bd4aee8c0059544e60b3a4edbf0cd11ed67579b2a6dcae264f3b599
 MISC metadata.xml 245 RMD160 6b03982a4d5f32d9fa6b9259ae36f9fcb07c8404 SHA1 fb16c7b4c5ab071dd979f761b8bb075f5396b737 SHA256 375a1da02cd2c393ce2378a73c1ce08134bc030b3bb378c6a4d6ca9cd5be1f8d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk2S+AgACgkQknrdDGLu8JBBNwD/bjvRkBkG7K1o16geI177b94X
-rCcsEGputaUTmXy5tysA/jqxoxx9j8MNyZttY547GPvyx7CuLjgjPB3nZFYbmD5J
-=Z+Rq
+iF4EAREIAAYFAk302aIACgkQknrdDGLu8JAjTgEAjCQmDAGYzRqSAwIlS1uihHUx
+fEGLMjLkqKjDkPp8UscBAIeuqjXs1nKkv8/iuOKsq5yMyevzNPw8gSF7aNjdKcEM
+=03GH
 -----END PGP SIGNATURE-----
diff --git a/app-text/mupdf/files/mupdf-0.8.165-buildsystem.patch b/app-text/mupdf/files/mupdf-0.8.165-buildsystem.patch
new file mode 100644
index 000000000000..cc04f8d93740
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-0.8.165-buildsystem.patch
@@ -0,0 +1,24 @@
+--- mupdf-0.8.165/Makerules
++++ mupdf-0.8.165/Makerules
+@@ -3,10 +3,10 @@
+ OS ?= $(shell uname)
+ OS := $(OS:MINGW%=MINGW)
+ 
+-CFLAGS += -Wall
++CFLAGS +=
+ 
+ ifeq "$(build)" "debug"
+-CFLAGS += -pipe -g
++CFLAGS +=
+ else ifeq "$(build)" "profile"
+ CFLAGS += -pipe -O2 -DNDEBUG -pg
+ LDFLAGS += -pg
+@@ -20,7 +20,7 @@
+ 
+ ifeq "$(OS)" "Linux"
+ SYS_FREETYPE_INC := `pkg-config --cflags freetype2`
+-X11_LIBS := -lX11 -lXext
++X11_LIBS := `pkg-config --libs x11 xext`
+ endif
+ 
+ ifeq "$(OS)" "FreeBSD"
diff --git a/app-text/mupdf/files/mupdf-0.8.165-zoom.patch b/app-text/mupdf/files/mupdf-0.8.165-zoom.patch
new file mode 100644
index 000000000000..9f98ff766b16
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-0.8.165-zoom.patch
@@ -0,0 +1,57 @@
+--- mupdf-0.8.165/apps/man/mupdf.1
++++ mupdf-0.8.165/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.165/apps/pdfapp.c
++++ mupdf-0.8.165/apps/pdfapp.c
+@@ -736,6 +736,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);
+@@ -859,6 +873,7 @@
+ 		break;
+ 
+ 	case 'b':
++	case '\b': //backspace
+ 		panto = DONT_PAN;
+ 		if (app->numberlen > 0)
+ 			app->pageno -= atoi(app->number);
+@@ -867,6 +882,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.165.ebuild b/app-text/mupdf/mupdf-0.8.165.ebuild
new file mode 100644
index 000000000000..c0d2d691e515
--- /dev/null
+++ b/app-text/mupdf/mupdf-0.8.165.ebuild
@@ -0,0 +1,62 @@
+# 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.165.ebuild,v 1.1 2011/06/12 15:22:00 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_nox11="NOX11=yes MUPDF= "
+
+	emake CC="$(tc-getCC)" \
+		build=debug verbose=true ${my_nox11} -j1 || die
+}
+
+src_install() {
+	emake prefix="${D}usr" LIBDIR="${D}usr/$(get_libdir)" \
+		build=debug verbose=true ${my_nox11} 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"
+}