remove old version

(Portage version: 2.1.10.63/cvs/Linux x86_64)

8 files changed, 8 insertions, 366 deletions

diff --git a/app-text/mupdf/ChangeLog b/app-text/mupdf/ChangeLog
index 2be6f4178e3c..0bba90851edc 100644
--- a/app-text/mupdf/ChangeLog
+++ b/app-text/mupdf/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/mupdf
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/ChangeLog,v 1.44 2012/06/02 18:10:29 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/ChangeLog,v 1.45 2012/06/05 19:52:45 xmw Exp $
+
+  05 Jun 2012; Michael Weber <xmw@gentoo.org>
+  -files/mupdf-0.8.165-buildsystem.patch, -files/mupdf-0.8.165-zoom.patch,
+  -files/mupdf-0.9-dpi_hack.patch, -files/mupdf-0.9-scroll_hack.patch,
+  -files/mupdf-9999-scroll.patch, -files/mupdf-9999-zoom.patch,
+  -mupdf-0.9.ebuild:
+  remove old version
 
   02 Jun 2012; Michael Weber <xmw@gentoo.org> mupdf-1.0.ebuild:
   ppc stable (bug 417211)
diff --git a/app-text/mupdf/files/mupdf-0.8.165-buildsystem.patch b/app-text/mupdf/files/mupdf-0.8.165-buildsystem.patch
deleted file mode 100644
index cc04f8d93740..000000000000
--- a/app-text/mupdf/files/mupdf-0.8.165-buildsystem.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- 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
deleted file mode 100644
index 9f98ff766b16..000000000000
--- a/app-text/mupdf/files/mupdf-0.8.165-zoom.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- 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/files/mupdf-0.9-dpi_hack.patch b/app-text/mupdf/files/mupdf-0.9-dpi_hack.patch
deleted file mode 100644
index 10e17ea202b4..000000000000
--- a/app-text/mupdf/files/mupdf-0.9-dpi_hack.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From http://aur.archlinux.org/packages.php?ID=52333
-
---- mupdf-0.9/apps/x11_main.c
-+++ mupdf-0.9/apps/x11_main.c
-@@ -539,6 +539,21 @@
- 	exit(1);
- }
- 
-+int get_dpi(void)
-+{
-+	Display *xdpy;
-+	int xscr;
-+	int x = 0;
-+	
-+	if ((xdpy = XOpenDisplay(NULL))) {
-+		xscr = DefaultScreen(xdpy);
-+		x = (int) (DisplayWidth(xdpy, xscr) * 25.4 /
-+		DisplayWidthMM(xdpy, xscr) + 0.5);
-+		XCloseDisplay(xdpy);
-+	}
-+	return x;
-+}
-+
- int main(int argc, char **argv)
- {
- 	int c;
-@@ -547,7 +562,7 @@
- 	KeySym keysym;
- 	int oldx = 0;
- 	int oldy = 0;
--	int resolution = 72;
-+	int resolution = get_dpi();
- 	int pageno = 1;
- 	int accelerate = 1;
- 	int fd;
diff --git a/app-text/mupdf/files/mupdf-0.9-scroll_hack.patch b/app-text/mupdf/files/mupdf-0.9-scroll_hack.patch
deleted file mode 100644
index 9fe63a5fd82d..000000000000
--- a/app-text/mupdf/files/mupdf-0.9-scroll_hack.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-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
-@@ -911,7 +917,7 @@
- 
- 	case ' ':
- 	case 'f':
--		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-scroll.patch b/app-text/mupdf/files/mupdf-9999-scroll.patch
deleted file mode 100644
index d74839185606..000000000000
--- a/app-text/mupdf/files/mupdf-9999-scroll.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-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
deleted file mode 100644
index 9db6aa3dffd4..000000000000
--- a/app-text/mupdf/files/mupdf-9999-zoom.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- 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.9.ebuild b/app-text/mupdf/mupdf-0.9.ebuild
deleted file mode 100644
index 662ceadbc587..000000000000
--- a/app-text/mupdf/mupdf-0.9.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# 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-0.9.ebuild,v 1.8 2012/05/04 03:33:12 jdhore Exp $
-
-EAPI=4
-
-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 ~amd64-linux"
-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}
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.8.165-buildsystem.patch
-
-	if ! use vanilla ; then
-		epatch "${FILESDIR}"/${PN}-0.8.165-zoom.patch
-		epatch "${FILESDIR}"/${P}-scroll_hack.patch
-		epatch "${FILESDIR}"/${P}-dpi_hack.patch
-	fi
-}
-
-src_compile() {
-	use X || my_nox11="NOX11=yes MUPDF= "
-
-	emake CC="$(tc-getCC)" \
-		build=debug verbose=true ${my_nox11} -j1
-}
-
-src_install() {
-	emake prefix="${ED}usr" libdir="${ED}usr/$(get_libdir)" \
-		build=debug verbose=true ${my_nox11} install
-
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins debian/mupdf.pc
-
-	if use X ; then
-		domenu debian/mupdf.desktop
-		doicon debian/mupdf.xpm
-		doman apps/man/mupdf.1
-	fi
-	doman apps/man/pdf{clean,draw,show}.1
-	dodoc README
-
-	# avoid collision with app-text/poppler-utils
-	mv "${ED}"usr/bin/pdfinfo "${ED}"usr/bin/mupdf_pdfinfo || die
-}
-
-pkg_postinst() {
-	elog "pdfinfo was renamed to mupdf_pdfinfo"
-}