x86 stable, removing old versions for security reasons

(Portage version: 2.1.9.42/cvs/Linux x86_64)

8 files changed, 10 insertions, 325 deletions

diff --git a/app-text/mupdf/ChangeLog b/app-text/mupdf/ChangeLog
index b7d046bd9c60..80225c977c81 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.14 2011/03/29 18:33:04 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/ChangeLog,v 1.15 2011/03/30 09:29:34 xmw Exp $
+
+  30 Mar 2011; Michael Weber <xmw@gentoo.org> -mupdf-0.7-r1.ebuild,
+  -mupdf-0.7_p20110212.ebuild, -files/mupdf-0.7-buildsystem.patch,
+  -files/mupdf-0.7-zoom.patch, -files/mupdf-0.7_p20110212-buildsystem.patch,
+  -files/mupdf-0.7_p20110212-zoom.patch, mupdf-0.8.15.ebuild:
+  x86 stable (thanks to Andreas Schürch and Myckel Habets for testing, bug
+  358029), removing old affected versions from tree
 
   29 Mar 2011; Michael Weber <xmw@gentoo.org> mupdf-0.8.15.ebuild:
   ppc stable (bug 358029)
diff --git a/app-text/mupdf/files/mupdf-0.7-buildsystem.patch b/app-text/mupdf/files/mupdf-0.7-buildsystem.patch
deleted file mode 100644
index 003e22a37e32..000000000000
--- a/app-text/mupdf/files/mupdf-0.7-buildsystem.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- Makefile.orig	2010-08-30 13:49:42.022000015 +0200
-+++ Makefile	2010-08-30 13:51:30.274000015 +0200
-@@ -6,7 +6,8 @@
- default: all
- 
- build ?= debug
--prefix ?= /usr/local
-+prefix ?= /usr
-+libprefix ?= $(prefix)/lib
- 
- OBJDIR := build/$(build)
- GENDIR := build/generated
-@@ -378,7 +379,7 @@
- 	rm -rf build
- 
- install: $(OBJDIR) $(GENDIR) $(MUPDF_LIB) $(APPS)
--	install -d $(prefix)/bin $(prefix)/lib $(prefix)/include
-+	install -d $(prefix)/bin $(libprefix) $(prefix)/include
- 	install $(APPS) $(prefix)/bin
--	install $(MUPDF_LIB) $(prefix)/lib
-+	install $(MUPDF_LIB) $(libprefix)
- 	install $(MUPDF_HDR) $(prefix)/include
---- Makerules.orig	2010-08-30 13:52:12.870000016 +0200
-+++ Makerules	2010-08-30 13:54:08.731000014 +0200
-@@ -4,8 +4,8 @@
- OS := $(OS:MINGW%=MINGW)
- 
- CC ?= cc
--CFLAGS := -Ifitz -Imupdf -Wall
--LDFLAGS :=
-+CFLAGS += -Ifitz -Imupdf
-+LDFLAGS +=
- 
- ifeq "$(build)" "debug"
- CFLAGS += -pipe -g
-@@ -21,7 +21,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.7-zoom.patch b/app-text/mupdf/files/mupdf-0.7-zoom.patch
deleted file mode 100644
index 0f33e2aa0743..000000000000
--- a/app-text/mupdf/files/mupdf-0.7-zoom.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-Michael Weber <xmw at gentoo dot org> 09/09/2010
-
---- apps/pdfapp.c.orig	2010-09-09 01:59:16.820000053 +0200
-+++ apps/pdfapp.c	2010-09-09 02:02:32.400000054 +0200
-@@ -602,6 +602,20 @@
- 		pdfapp_showpage(app, 0, 1);
- 		break;
- 
-+	case '_': // zoom to default resolution
-+		app->resolution = 72;
-+		pdfapp_showpage(app, 0, 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);
-+		break; 
-+
- 	case 'L':
- 		app->rotate -= 90;
- 		pdfapp_showpage(app, 0, 1);
-@@ -725,6 +739,7 @@
- 		break;
- 
- 	case 'b':
-+	case '\b': //backspace
- 		panto = DONT_PAN;
- 		if (app->numberlen > 0)
- 			app->pageno -= atoi(app->number);
-@@ -733,6 +748,7 @@
- 		break;
- 
- 	case ' ':
-+	case 'f':
- 		panto = DONT_PAN;
- 		if (app->numberlen > 0)
- 			app->pageno += atoi(app->number);
---- debian/mupdf.1.orig	2010-09-09 02:05:07.573000045 +0200
-+++ debian/mupdf.1	2010-09-09 02:14:25.744000054 +0200
-@@ -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
-@@ -96,6 +96,15 @@
- .B \-
- Zoom 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 <
- Rotate page counter-clockwise or left by 90\(de.
- .TP
diff --git a/app-text/mupdf/files/mupdf-0.7_p20110212-buildsystem.patch b/app-text/mupdf/files/mupdf-0.7_p20110212-buildsystem.patch
deleted file mode 100644
index 299179706ea5..000000000000
--- a/app-text/mupdf/files/mupdf-0.7_p20110212-buildsystem.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- mupdf-0.7_p20110212/Makerules.orig
-+++ mupdf-0.7_p20110212/Makerules
-@@ -4,8 +4,8 @@
- OS := $(OS:MINGW%=MINGW)
- 
- CC ?= cc
--CFLAGS := -Ifitz -Imupdf -Wall
--LDFLAGS :=
-+CFLAGS += -Ifitz -Imupdf
-+LDFLAGS +=
- 
- ifeq "$(build)" "debug"
- CFLAGS += -pipe -g
-@@ -21,7 +21,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.7_p20110212-zoom.patch b/app-text/mupdf/files/mupdf-0.7_p20110212-zoom.patch
deleted file mode 100644
index 4576ea4407e4..000000000000
--- a/app-text/mupdf/files/mupdf-0.7_p20110212-zoom.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-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-0.7-r1.ebuild b/app-text/mupdf/mupdf-0.7-r1.ebuild
deleted file mode 100644
index 5c4f2e844479..000000000000
--- a/app-text/mupdf/mupdf-0.7-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-0.7-r1.ebuild,v 1.4 2010/11/14 23:02:18 hwoarang Exp $
-
-EAPI=2
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="a lightweight PDF viewer and toolkit written in portable C"
-HOMEPAGE="http://mupdf.com/"
-SRC_URI="http://${PN}.com/download/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-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}"/${P}-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"
-}
diff --git a/app-text/mupdf/mupdf-0.7_p20110212.ebuild b/app-text/mupdf/mupdf-0.7_p20110212.ebuild
deleted file mode 100644
index 51b8336099ae..000000000000
--- a/app-text/mupdf/mupdf-0.7_p20110212.ebuild
+++ /dev/null
@@ -1,63 +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.7_p20110212.ebuild,v 1.2 2011/02/20 10:26:00 xarthisius 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="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-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}"/${P}-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 -j1 || die
-}
-
-src_install() {
-	emake build=release ${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 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"
-}
diff --git a/app-text/mupdf/mupdf-0.8.15.ebuild b/app-text/mupdf/mupdf-0.8.15.ebuild
index 0144c8c8c4a7..46d6566febd2 100644
--- a/app-text/mupdf/mupdf-0.8.15.ebuild
+++ b/app-text/mupdf/mupdf-0.8.15.ebuild
@@ -1,6 +1,6 @@
 # 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.3 2011/03/29 18:33:04 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-0.8.15.ebuild,v 1.4 2011/03/30 09:29:34 xmw Exp $
 
 EAPI=2
 
@@ -12,7 +12,7 @@ SRC_URI="http://mupdf.com/download/${P}-source.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="X vanilla"
 
 RDEPEND="media-libs/freetype:2