Updated -9999.build (thanks Shark, bug 401205), remove old version

(Portage version: 2.1.10.44/cvs/Linux x86_64)

5 files changed, 137 insertions, 82 deletions

diff --git a/app-text/mupdf/ChangeLog b/app-text/mupdf/ChangeLog
index 4faab85c6622..42992c39f7e1 100644
--- a/app-text/mupdf/ChangeLog
+++ b/app-text/mupdf/ChangeLog
@@ -1,6 +1,11 @@
 # 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.24 2011/12/18 22:23:40 xmw Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/ChangeLog,v 1.25 2012/01/28 21:14:47 xmw Exp $
+
+  28 Jan 2012; Michael Weber <xmw@gentoo.org> -mupdf-0.8.165.ebuild,
+  mupdf-9999.ebuild, +files/mupdf-9999-scroll.patch,
+  +files/mupdf-9999-zoom.patch:
+  Updated -9999.build (thanks Shark, bug 401205), remove old version
 
   18 Dec 2011; Michael Weber <xmw@gentoo.org> mupdf-0.9.ebuild:
   ppc stable (bug 390141)
diff --git a/app-text/mupdf/files/mupdf-9999-scroll.patch b/app-text/mupdf/files/mupdf-9999-scroll.patch
new file mode 100644
index 000000000000..d74839185606
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-9999-scroll.patch
@@ -0,0 +1,59 @@
+From http://aur.archlinux.org/packages.php?ID=52333
+
+--- mupdf-0.9/apps/pdfapp.c
++++ mupdf-0.9/apps/pdfapp.c
+@@ -817,11 +817,15 @@
+ 		break;
+ 
+ 	case 'j':
++		if (app->pany + app->image->h <= app->winh)
++			goto pagedown;
+ 		app->pany -= app->image->h / 10;
+ 		pdfapp_showpage(app, 0, 0, 1);
+ 		break;
+ 
+ 	case 'k':
++		if (app->pany >= 0)
++			goto pageup;
+ 		app->pany += app->image->h / 10;
+ 		pdfapp_showpage(app, 0, 0, 1);
+ 		break;
+@@ -885,6 +889,7 @@
+ 	 */
+ 
+ 	case ',':
++		pageup:
+ 		panto = PAN_TO_BOTTOM;
+ 		if (app->numberlen > 0)
+ 			app->pageno -= atoi(app->number);
+@@ -893,6 +898,7 @@
+ 		break;
+ 
+ 	case '.':
++		pagedown:
+ 		panto = PAN_TO_TOP;
+ 		if (app->numberlen > 0)
+ 			app->pageno += atoi(app->number);
+@@ -902,7 +908,7 @@
+ 	case 'b':
+ 	case '\b': //backspace
+-		panto = DONT_PAN;
++		panto = PAN_TO_TOP;
+ 		if (app->numberlen > 0)
+ 			app->pageno -= atoi(app->number);
+ 		else
+
+@ -1067,7 +1073,12 @@
+ 				int isx = (modifiers & (1<<0));
+ 				int xstep = isx ? 20 * dir : 0;
+ 				int ystep = !isx ? 20 * dir : 0;
+-				pdfapp_panview(app, app->panx + xstep, app->pany + ystep);
++ 				if (!isx && dir < 0 && app->pany + app->image->h <= app->winh)
++ 					pdfapp_onkey(app, 'j');
++ 				else if (!isx && dir > 0 && app->pany >= 0)
++ 					pdfapp_onkey(app, 'k');
++ 				else
++ 					pdfapp_panview(app, app->panx + xstep, app->pany + ystep);
+ 			}
+ 		}
+ 	}
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..9db6aa3dffd4
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-9999-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
deleted file mode 100644
index 12e5b216943a..000000000000
--- a/app-text/mupdf/mupdf-0.8.165.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# 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.4 2011/08/23 23:07:36 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"
-}
diff --git a/app-text/mupdf/mupdf-9999.ebuild b/app-text/mupdf/mupdf-9999.ebuild
index 96dd54ed96e2..2e2dec00cd68 100644
--- a/app-text/mupdf/mupdf-9999.ebuild
+++ b/app-text/mupdf/mupdf-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.5 2011/08/13 02:53:50 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-9999.ebuild,v 1.6 2012/01/28 21:14:47 xmw Exp $
 
-EAPI=2
+EAPI=4
 
-EGIT_REPO_URI="http://mupdf.com/repos/mupdf.git"
+EGIT_REPO_URI="git://git.ghostscript.com/mupdf.git"
 
 inherit eutils flag-o-matic git-2 multilib toolchain-funcs
 
@@ -29,7 +29,10 @@ DEPEND="${RDEPEND}
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-0.8.165-buildsystem.patch
 
-	use vanilla || epatch "${FILESDIR}"/${PN}-0.8.165-zoom.patch
+	if ! use vanilla ; then
+		epatch "${FILESDIR}"/${PN}-9999-zoom.patch
+		epatch "${FILESDIR}"/${PN}-9999-scroll.patch
+	fi
 }
 
 src_compile() {
@@ -45,20 +48,13 @@ src_install() {
 		build=debug verbose=true ${my_nox11} install || die
 
 	insinto /usr/$(get_libdir)/pkgconfig
-	doins debian/mupdf.pc || die
+	doins debian/mupdf.pc
 
 	if use X ; then
-		domenu debian/mupdf.desktop || die
-		doicon debian/mupdf.xpm || die
-		doman apps/man/mupdf.1 || die
+		domenu debian/mupdf.desktop
+		doicon debian/mupdf.xpm
+		doman apps/man/mupdf.1
 	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"
+	doman apps/man/mupdf{clean,draw,show}.1
+	dodoc README
 }