x86 stable, removing old versions for security reasons

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

9 files changed, 22 insertions, 335 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/Manifest b/app-text/mupdf/Manifest
index dd8fee9677cf..b513ff6e9fa4 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -1,15 +1,17 @@
-AUX mupdf-0.7-buildsystem.patch 1111 RMD160 9246a80c1cedf49dc39b694e9913f98f295d6a93 SHA1 17b2691984e799d423d7b90544df15fff054c70a SHA256 bd4dae8cd56579cd873654bf804a26cbad92a4b827673f04ab7a3d16e01d21b9
-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
+-----BEGIN PGP SIGNED MESSAGE-----
+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
-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 1490 RMD160 32f3ad91a7f36fb1f847a99fc1b0422ab587a4e6 SHA1 db7c18619b529a932dd7e206a77c2b6cc6e3d5fd SHA256 568b72651020bd5fe1572dd488368b0c7b6b2fdeaffe11a92036527c5a935b76
+EBUILD mupdf-0.8.15.ebuild 1489 RMD160 f68975ba24f9b2c130e5c6ae63d3b7e36bd57bbe SHA1 49ed1c42971a8f98a7bdc82a2d61f4200a12dbac SHA256 c4065012a49d5947e824fcef70719fb46916403d16c94929419324b6d449c9f4
 EBUILD mupdf-9999.ebuild 1513 RMD160 13bd15baaac683d56d0e20b9fd47700875ac47a2 SHA1 f2f6959ca81c082be5be0c654ad607663f3912d2 SHA256 ce582b8cad89fda79a5101c6592a290641cb384962194fb2e9fa2e4798476c3a
-MISC ChangeLog 2607 RMD160 b22cbe06f9912b4707fff12bf343f5388c08ecc1 SHA1 c6a9967025ffa2480b2b76fd4786eaab84a2fc62 SHA256 6fe7ed172616b67ca1a4517c4730266919f6f4e21630f59ff05aa5bfebcb72fe
+MISC ChangeLog 3010 RMD160 eba69a450cf9c55f8091dfa86eb0dbe5cf6b833b SHA1 9835563639c521d8a3635370fa57746777085071 SHA256 7282b45b9c0516db935cce223e8cce33501aaa70f7aabf1331434ce3cfe84a09
 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
+-----END PGP SIGNATURE-----
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