remove old

(Portage version: 2.1.2_pre1)
 (Unsigned Manifest commit)

10 files changed, 0 insertions, 649 deletions

diff --git a/app-text/poppler/files/digest-poppler-0.5.0-r4 b/app-text/poppler/files/digest-poppler-0.5.0-r4
deleted file mode 100644
index ce2558469e43..000000000000
--- a/app-text/poppler/files/digest-poppler-0.5.0-r4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c84c1be19f43e4a84872ff08234c1960 poppler-0.5.0.tar.gz 935312
-RMD160 a5bad2dd16a7b99b931c15757ff33591f2c4307a poppler-0.5.0.tar.gz 935312
-SHA256 554fad3767c23c96ad886fe0220073133016d64f416273c26aea43ea80d4563b poppler-0.5.0.tar.gz 935312
diff --git a/app-text/poppler/files/digest-poppler-0.5.0-r5 b/app-text/poppler/files/digest-poppler-0.5.0-r5
deleted file mode 100644
index ce2558469e43..000000000000
--- a/app-text/poppler/files/digest-poppler-0.5.0-r5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c84c1be19f43e4a84872ff08234c1960 poppler-0.5.0.tar.gz 935312
-RMD160 a5bad2dd16a7b99b931c15757ff33591f2c4307a poppler-0.5.0.tar.gz 935312
-SHA256 554fad3767c23c96ad886fe0220073133016d64f416273c26aea43ea80d4563b poppler-0.5.0.tar.gz 935312
diff --git a/app-text/poppler/files/digest-poppler-0.5.1 b/app-text/poppler/files/digest-poppler-0.5.1
deleted file mode 100644
index 686adedc78db..000000000000
--- a/app-text/poppler/files/digest-poppler-0.5.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 a136cd731892f4570933034ba97c8704 poppler-0.5.1.tar.gz 954930
-RMD160 ffd39323da0e0c487a6e7de48d8a607385189ddd poppler-0.5.1.tar.gz 954930
-SHA256 2ee3f06d64dd703a2411428169fe21c17f6358950bb797d52ca8eebd1dcf1abe poppler-0.5.1.tar.gz 954930
diff --git a/app-text/poppler/files/poppler-0.4.3-pdf2xml.patch b/app-text/poppler/files/poppler-0.4.3-pdf2xml.patch
deleted file mode 100644
index de6e69bce6af..000000000000
--- a/app-text/poppler/files/poppler-0.4.3-pdf2xml.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --exclude-from=/home/dang/.diffrc -u -ruN poppler-0.4.3.orig/pdf2xml.dtd poppler-0.4.3/pdf2xml.dtd
---- pdf2xml.dtd	1969-12-31 19:00:00.000000000 -0500
-+++ pdf2xml.dtd	2006-01-16 17:44:43.000000000 -0500
-@@ -0,0 +1,28 @@
-+<?xml version="1.0"?>
-+<!ELEMENT pdf2xml (page+)>
-+<!ELEMENT page (fontspec*, text*)>
-+<!ATTLIST page
-+	number CDATA #REQUIRED
-+	position CDATA #REQUIRED
-+	top CDATA #REQUIRED
-+	left CDATA #REQUIRED
-+	height CDATA #REQUIRED
-+	width CDATA #REQUIRED
-+>
-+<!ELEMENT fontspec EMPTY>
-+<!ATTLIST fontspec
-+	id CDATA #REQUIRED
-+	size CDATA #REQUIRED
-+	family CDATA #REQUIRED
-+	color CDATA #REQUIRED
-+>
-+<!ELEMENT text (#PCDATA | b | i)*>
-+<!ATTLIST text
-+	top CDATA #REQUIRED
-+	left CDATA #REQUIRED
-+	width CDATA #REQUIRED
-+	height CDATA #REQUIRED
-+	font CDATA #REQUIRED
-+>
-+<!ELEMENT b (#PCDATA)>
-+<!ELEMENT i (#PCDATA)>
diff --git a/app-text/poppler/files/poppler-0.4.4-bug117481.patch b/app-text/poppler/files/poppler-0.4.4-bug117481.patch
deleted file mode 100644
index 8e49388f27d3..000000000000
--- a/app-text/poppler/files/poppler-0.4.4-bug117481.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --exclude-from=/home/dang/.diffrc -u -ruN poppler-0.4.4.orig/poppler/JBIG2Stream.cc poppler-0.4.4/poppler/JBIG2Stream.cc
---- poppler-0.4.4.orig/poppler/JBIG2Stream.cc	2006-01-10 13:53:54.000000000 -0500
-+++ poppler-0.4.4/poppler/JBIG2Stream.cc	2006-01-19 12:35:17.000000000 -0500
-@@ -7,6 +7,7 @@
- //========================================================================
- 
- #include <config.h>
-+#include <limits.h>
- 
- #ifdef USE_GCC_PRAGMAS
- #pragma implementation
-@@ -2924,6 +2925,11 @@
-     return NULL;
-   }
- 
-+  if (w < 0 || h <= 0 || w >= INT_MAX / h) {
-+    error(-1, "invalid width/height");
-+    return NULL;
-+  }
-+
-   bitmap = new JBIG2Bitmap(0, w, h);
-   bitmap->clearToZero();
- 
diff --git a/app-text/poppler/files/poppler-0.4.4-cairo-lines.patch b/app-text/poppler/files/poppler-0.4.4-cairo-lines.patch
deleted file mode 100644
index 30cd2614ab75..000000000000
--- a/app-text/poppler/files/poppler-0.4.4-cairo-lines.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --exclude-from=/home/dang/.diffrc -u -ruN poppler-0.4.4.orig/poppler/CairoOutputDev.cc poppler-0.4.4/poppler/CairoOutputDev.cc
---- poppler-0.4.4.orig/poppler/CairoOutputDev.cc	2005-12-12 17:24:01.000000000 -0500
-+++ poppler-0.4.4/poppler/CairoOutputDev.cc	2006-01-19 12:42:12.000000000 -0500
-@@ -189,7 +189,11 @@
- 
- void CairoOutputDev::updateLineWidth(GfxState *state) {
-   LOG(printf ("line width: %f\n", state->getTransformedLineWidth()));
--  cairo_set_line_width (cairo, state->getTransformedLineWidth());
-+  if (state->getTransformedLineWidth() == 0.0) {
-+    cairo_set_line_width (cairo, 72.0/300.0);
-+  } else {
-+    cairo_set_line_width (cairo, state->getTransformedLineWidth());
-+  }
- }
- 
- void CairoOutputDev::updateFillColor(GfxState *state) {
diff --git a/app-text/poppler/files/poppler-0.5.0-cairo-ft.patch b/app-text/poppler/files/poppler-0.5.0-cairo-ft.patch
deleted file mode 100644
index ec2d99d2b2c1..000000000000
--- a/app-text/poppler/files/poppler-0.5.0-cairo-ft.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --exclude-from=/home/dang/.diffrc -u -ruN poppler-0.5.0.orig/test/Makefile.am poppler-0.5.0/test/Makefile.am
---- poppler-0.5.0.orig/test/Makefile.am	2005-12-09 14:38:49.000000000 -0500
-+++ poppler-0.5.0/test/Makefile.am	2006-01-20 10:29:58.000000000 -0500
-@@ -31,6 +31,7 @@
- 	-I$(top_srcdir)				\
- 	-I$(top_srcdir)/poppler			\
- 	$(cairo_includes)			\
-+ 	$(FREETYPE_CFLAGS)			\
- 	$(GTK_TEST_CFLAGS)			
- 
- noinst_PROGRAMS = $(gtk_splash_test) $(gtk_cairo_test) $(pdf_inspector)
diff --git a/app-text/poppler/files/poppler-0.5.0-pdftoppm.patch b/app-text/poppler/files/poppler-0.5.0-pdftoppm.patch
deleted file mode 100644
index 2d423bf45b1a..000000000000
--- a/app-text/poppler/files/poppler-0.5.0-pdftoppm.patch
+++ /dev/null
@@ -1,420 +0,0 @@
-diff -Naupr poppler-0.5.0/utils/Makefile.am poppler/utils/Makefile.am
---- poppler-0.5.0/utils/Makefile.am	2006-01-03 15:55:44.000000000 +0100
-+++ poppler/utils/Makefile.am	2006-02-03 23:42:51.000000000 +0100
-@@ -13,7 +13,8 @@ bin_PROGRAMS =					\
- 	pdfinfo					\
- 	pdftops					\
- 	pdftotext				\
--	pdftohtml
-+	pdftohtml				\
-+	pdftoppm
- 
- dist_man1_MANS =				\
- 	pdffonts.1				\
-@@ -21,7 +22,8 @@ dist_man1_MANS =				\
- 	pdfinfo.1				\
- 	pdftops.1				\
- 	pdftotext.1				\
--	pdftohtml.1
-+	pdftohtml.1				\
-+	pdftoppm.1
- 
- common = parseargs.c parseargs.h
- 
-@@ -56,3 +58,7 @@ pdftohtml_SOURCES =				\
- 	HtmlOutputDev.cc			\
- 	HtmlOutputDev.h				\
- 	$(common)
-+
-+pdftoppm_SOURCES =				\
-+	pdftoppm.cc				\
-+	$(common)
-diff -Naupr poppler-0.5.0/utils/Makefile.in poppler/utils/Makefile.in
---- poppler-0.5.0/utils/Makefile.in	2006-01-10 18:54:56.000000000 +0100
-+++ poppler/utils/Makefile.in	2006-02-03 23:43:29.000000000 +0100
-@@ -37,7 +37,8 @@ POST_UNINSTALL = :
- build_triplet = @build@
- host_triplet = @host@
- bin_PROGRAMS = pdffonts$(EXEEXT) pdfimages$(EXEEXT) pdfinfo$(EXEEXT) \
--	pdftops$(EXEEXT) pdftotext$(EXEEXT) pdftohtml$(EXEEXT)
-+	pdftops$(EXEEXT) pdftotext$(EXEEXT) pdftohtml$(EXEEXT) \
-+	pdftoppm$(EXEEXT)
- subdir = utils
- DIST_COMMON = $(dist_man1_MANS) $(srcdir)/Makefile.am \
- 	$(srcdir)/Makefile.in
-@@ -73,6 +74,10 @@ am_pdftohtml_OBJECTS = pdftohtml.$(OBJEX
- pdftohtml_OBJECTS = $(am_pdftohtml_OBJECTS)
- pdftohtml_LDADD = $(LDADD)
- pdftohtml_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
-+am_pdftoppm_OBJECTS = pdftoppm.$(OBJEXT) $(am__objects_1)
-+pdftoppm_OBJECTS = $(am_pdftoppm_OBJECTS)
-+pdftoppm_LDADD = $(LDADD)
-+pdftoppm_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
- am_pdftops_OBJECTS = pdftops.$(OBJEXT) $(am__objects_1)
- pdftops_OBJECTS = $(am_pdftops_OBJECTS)
- pdftops_LDADD = $(LDADD)
-@@ -101,10 +106,11 @@ CXXLD = $(CXX)
- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(pdffonts_SOURCES) $(pdfimages_SOURCES) $(pdfinfo_SOURCES) \
--	$(pdftohtml_SOURCES) $(pdftops_SOURCES) $(pdftotext_SOURCES)
--DIST_SOURCES = $(pdffonts_SOURCES) $(pdfimages_SOURCES) \
--	$(pdfinfo_SOURCES) $(pdftohtml_SOURCES) $(pdftops_SOURCES) \
-+	$(pdftohtml_SOURCES) $(pdftoppm_SOURCES) $(pdftops_SOURCES) \
- 	$(pdftotext_SOURCES)
-+DIST_SOURCES = $(pdffonts_SOURCES) $(pdfimages_SOURCES) \
-+	$(pdfinfo_SOURCES) $(pdftohtml_SOURCES) $(pdftoppm_SOURCES) \
-+	$(pdftops_SOURCES) $(pdftotext_SOURCES)
- man1dir = $(mandir)/man1
- NROFF = nroff
- MANS = $(dist_man1_MANS)
-@@ -278,7 +284,8 @@ dist_man1_MANS = \
- 	pdfinfo.1				\
- 	pdftops.1				\
- 	pdftotext.1				\
--	pdftohtml.1
-+	pdftohtml.1				\
-+	pdftoppm.1
- 
- common = parseargs.c parseargs.h
- pdffonts_SOURCES = \
-@@ -313,6 +320,10 @@ pdftohtml_SOURCES = \
- 	HtmlOutputDev.h				\
- 	$(common)
- 
-+pdftoppm_SOURCES = \
-+	pdftoppm.cc				\
-+	$(common)
-+
- all: all-am
- 
- .SUFFIXES:
-@@ -386,6 +397,9 @@ pdfinfo$(EXEEXT): $(pdfinfo_OBJECTS) $(p
- pdftohtml$(EXEEXT): $(pdftohtml_OBJECTS) $(pdftohtml_DEPENDENCIES) 
- 	@rm -f pdftohtml$(EXEEXT)
- 	$(CXXLINK) $(pdftohtml_LDFLAGS) $(pdftohtml_OBJECTS) $(pdftohtml_LDADD) $(LIBS)
-+pdftoppm$(EXEEXT): $(pdftoppm_OBJECTS) $(pdftoppm_DEPENDENCIES) 
-+	@rm -f pdftoppm$(EXEEXT)
-+	$(CXXLINK) $(pdftoppm_LDFLAGS) $(pdftoppm_OBJECTS) $(pdftoppm_LDADD) $(LIBS)
- pdftops$(EXEEXT): $(pdftops_OBJECTS) $(pdftops_DEPENDENCIES) 
- 	@rm -f pdftops$(EXEEXT)
- 	$(CXXLINK) $(pdftops_LDFLAGS) $(pdftops_OBJECTS) $(pdftops_LDADD) $(LIBS)
-@@ -408,6 +422,7 @@ distclean-compile:
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pdfimages.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pdfinfo.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pdftohtml.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pdftoppm.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pdftops.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pdftotext.Po@am__quote@
- 
-diff -Naupr poppler-0.5.0/utils/pdftoppm.1 poppler/utils/pdftoppm.1
---- poppler-0.5.0/utils/pdftoppm.1	1970-01-01 01:00:00.000000000 +0100
-+++ poppler/utils/pdftoppm.1	2005-12-12 21:15:11.000000000 +0100
-@@ -0,0 +1,113 @@
-+.\" Copyright 2004 Glyph & Cog, LLC
-+.TH pdftoppm 1 "22 January 2004"
-+.SH NAME
-+pdftoppm \- Portable Document Format (PDF) to Portable Pixmap (PPM)
-+converter (version 3.00)
-+.SH SYNOPSIS
-+.B pdftoppm
-+[options]
-+.I PDF-file PPM-root
-+.SH DESCRIPTION
-+.B Pdftoppm
-+converts Portable Document Format (PDF) files to color image files in
-+Portable Pixmap (PPM) format, grayscale image files in Portable
-+Graymap (PGM) format, or monochrome image files in Portable Bitmap
-+(PBM) format.
-+.PP
-+Pdftoppm reads the PDF file,
-+.IR PDF-file ,
-+and writes one PPM file for each page,
-+.IR PPM-root - nnnnnn .ppm,
-+where
-+.I nnnnnn
-+is the page number.
-+.SH CONFIGURATION FILE
-+Pdftoppm reads a configuration file at startup.  It first tries to
-+find the user's private config file, ~/.xpdfrc.  If that doesn't
-+exist, it looks for a system-wide config file, /etc/xpdf/xpdfrc. See the
-+.BR xpdfrc (5)
-+man page for details.
-+.SH OPTIONS
-+Many of the following options can be set with configuration file
-+commands.  These are listed in square brackets with the description of
-+the corresponding command line option.
-+.TP
-+.BI \-f " number"
-+Specifies the first page to convert.
-+.TP
-+.BI \-l " number"
-+Specifies the last page to convert.
-+.TP
-+.BI \-r " number"
-+Specifies the resolution, in DPI.  The default is 150 DPI.
-+.TP
-+.B \-mono
-+Generate a monochrome PBM file (instead of a color PPM file).
-+.TP
-+.B \-gray
-+Generate a grayscale PGM file (instead of a color PPM file).
-+.TP
-+.BI \-t1lib " yes | no"
-+Enable or disable t1lib (a Type 1 font rasterizer).  This defaults to
-+"yes".
-+.RB "[config file: " enableT1lib ]
-+.TP
-+.BI \-freetype " yes | no"
-+Enable or disable FreeType (a TrueType / Type 1 font rasterizer).
-+This defaults to "yes".
-+.RB "[config file: " enableFreeType ]
-+.TP
-+.BI \-aa " yes | no"
-+Enable or disable font anti-aliasing.  This defaults to "yes".
-+.RB "[config file: " antialias ]
-+.TP
-+.BI \-opw " password"
-+Specify the owner password for the PDF file.  Providing this will
-+bypass all security restrictions.
-+.TP
-+.BI \-upw " password"
-+Specify the user password for the PDF file.
-+.TP
-+.B \-q
-+Don't print any messages or errors.
-+.RB "[config file: " errQuiet ]
-+.TP
-+.B \-v
-+Print copyright and version information.
-+.TP
-+.B \-h
-+Print usage information.
-+.RB ( \-help
-+and
-+.B \-\-help
-+are equivalent.)
-+.SH EXIT CODES
-+The Xpdf tools use the following exit codes:
-+.TP
-+0
-+No error.
-+.TP
-+1
-+Error opening a PDF file.
-+.TP
-+2
-+Error opening an output file.
-+.TP
-+3
-+Error related to PDF permissions.
-+.TP
-+99
-+Other error.
-+.SH AUTHOR
-+The pdftoppm software and documentation are copyright 1996-2004 Glyph
-+& Cog, LLC.
-+.SH "SEE ALSO"
-+.BR xpdf (1),
-+.BR pdftops (1),
-+.BR pdftotext (1),
-+.BR pdfinfo (1),
-+.BR pdffonts (1),
-+.BR pdfimages (1),
-+.BR xpdfrc (5)
-+.br
-+.B http://www.foolabs.com/xpdf/
-diff -Naupr poppler-0.5.0/utils/pdftoppm.cc poppler/utils/pdftoppm.cc
---- poppler-0.5.0/utils/pdftoppm.cc	1970-01-01 01:00:00.000000000 +0100
-+++ poppler/utils/pdftoppm.cc	2006-02-03 23:57:43.000000000 +0100
-@@ -0,0 +1,190 @@
-+//========================================================================
-+//
-+// pdftoppm.cc
-+//
-+// Copyright 2003 Glyph & Cog, LLC
-+//
-+//========================================================================
-+
-+#include "config.h"
-+#include <poppler-config.h>
-+#include <stdio.h>
-+#include "parseargs.h"
-+#include "goo/gmem.h"
-+#include "goo/GooString.h"
-+#include "GlobalParams.h"
-+#include "Object.h"
-+#include "PDFDoc.h"
-+#include "splash/SplashBitmap.h"
-+#include "splash/Splash.h"
-+#include "SplashOutputDev.h"
-+
-+static int firstPage = 1;
-+static int lastPage = 0;
-+static int resolution = 150;
-+static GBool mono = gFalse;
-+static GBool gray = gFalse;
-+static char enableT1libStr[16] = "";
-+static char enableFreeTypeStr[16] = "";
-+static char antialiasStr[16] = "";
-+static char ownerPassword[33] = "";
-+static char userPassword[33] = "";
-+static GBool quiet = gFalse;
-+static char cfgFileName[256] = "";
-+static GBool printVersion = gFalse;
-+static GBool printHelp = gFalse;
-+
-+static ArgDesc argDesc[] = {
-+  {"-f",      argInt,      &firstPage,     0,
-+   "first page to print"},
-+  {"-l",      argInt,      &lastPage,      0,
-+   "last page to print"},
-+  {"-r",      argInt,      &resolution,    0,
-+   "resolution, in DPI (default is 150)"},
-+  {"-mono",   argFlag,     &mono,          0,
-+   "generate a monochrome PBM file"},
-+  {"-gray",   argFlag,     &gray,          0,
-+   "generate a grayscale PGM file"},
-+#if HAVE_T1LIB_H
-+  {"-t1lib",      argString,      enableT1libStr, sizeof(enableT1libStr),
-+   "enable t1lib font rasterizer: yes, no"},
-+#endif
-+#if HAVE_FREETYPE_FREETYPE_H | HAVE_FREETYPE_H
-+  {"-freetype",   argString,      enableFreeTypeStr, sizeof(enableFreeTypeStr),
-+   "enable FreeType font rasterizer: yes, no"},
-+#endif
-+  {"-aa",         argString,      antialiasStr,   sizeof(antialiasStr),
-+   "enable font anti-aliasing: yes, no"},
-+  {"-opw",    argString,   ownerPassword,  sizeof(ownerPassword),
-+   "owner password (for encrypted files)"},
-+  {"-upw",    argString,   userPassword,   sizeof(userPassword),
-+   "user password (for encrypted files)"},
-+  {"-q",      argFlag,     &quiet,         0,
-+   "don't print any messages or errors"},
-+  {"-cfg",        argString,      cfgFileName,    sizeof(cfgFileName),
-+   "configuration file to use in place of .xpdfrc"},
-+  {"-v",      argFlag,     &printVersion,  0,
-+   "print copyright and version info"},
-+  {"-h",      argFlag,     &printHelp,     0,
-+   "print usage information"},
-+  {"-help",   argFlag,     &printHelp,     0,
-+   "print usage information"},
-+  {"--help",  argFlag,     &printHelp,     0,
-+   "print usage information"},
-+  {"-?",      argFlag,     &printHelp,     0,
-+   "print usage information"},
-+  {NULL}
-+};
-+
-+int main(int argc, char *argv[]) {
-+  PDFDoc *doc;
-+  GooString *fileName;
-+  char *ppmRoot;
-+  char ppmFile[512];
-+  GooString *ownerPW, *userPW;
-+  SplashColor paperColor;
-+  SplashOutputDev *splashOut;
-+  GBool ok;
-+  int exitCode;
-+  int pg;
-+
-+  exitCode = 99;
-+
-+  // parse args
-+  ok = parseArgs(argDesc, &argc, argv);
-+  if (mono && gray) {
-+    ok = gFalse;
-+  }
-+  if (!ok || argc != 3 || printVersion || printHelp) {
-+    fprintf(stderr, "pdftoppm version %s\n", xpdfVersion);
-+    fprintf(stderr, "%s\n", xpdfCopyright);
-+    if (!printVersion) {
-+      printUsage("pdftoppm", "<PDF-file> <PPM-root>", argDesc);
-+    }
-+    goto err0;
-+  }
-+  fileName = new GooString(argv[1]);
-+  ppmRoot = argv[2];
-+
-+  // read config file
-+  globalParams = new GlobalParams(cfgFileName);
-+  if (enableT1libStr[0]) {
-+    if (!globalParams->setEnableT1lib(enableT1libStr)) {
-+      fprintf(stderr, "Bad '-t1lib' value on command line\n");
-+    }
-+  }
-+  if (enableFreeTypeStr[0]) {
-+    if (!globalParams->setEnableFreeType(enableFreeTypeStr)) {
-+      fprintf(stderr, "Bad '-freetype' value on command line\n");
-+    }
-+  }
-+  if (antialiasStr[0]) {
-+    if (!globalParams->setAntialias(antialiasStr)) {
-+      fprintf(stderr, "Bad '-aa' value on command line\n");
-+    }
-+  }
-+  if (quiet) {
-+    globalParams->setErrQuiet(quiet);
-+  }
-+
-+  // open PDF file
-+  if (ownerPassword[0]) {
-+    ownerPW = new GooString(ownerPassword);
-+  } else {
-+    ownerPW = NULL;
-+  }
-+  if (userPassword[0]) {
-+    userPW = new GooString(userPassword);
-+  } else {
-+    userPW = NULL;
-+  }
-+  doc = new PDFDoc(fileName, ownerPW, userPW);
-+  if (userPW) {
-+    delete userPW;
-+  }
-+  if (ownerPW) {
-+    delete ownerPW;
-+  }
-+  if (!doc->isOk()) {
-+    exitCode = 1;
-+    goto err1;
-+  }
-+
-+  // get page range
-+  if (firstPage < 1)
-+    firstPage = 1;
-+  if (lastPage < 1 || lastPage > doc->getNumPages())
-+    lastPage = doc->getNumPages();
-+
-+  // write PPM files
-+  paperColor[0] = 255;
-+  paperColor[1] = 255;
-+  paperColor[2] = 255;
-+  splashOut = new SplashOutputDev(mono ? splashModeMono1 :
-+				    gray ? splashModeMono8 :
-+				             splashModeRGB8, 4,
-+				  gFalse, paperColor);
-+  splashOut->startDoc(doc->getXRef());
-+  for (pg = firstPage; pg <= lastPage; ++pg) {
-+    doc->displayPage(splashOut, pg, resolution, resolution, 0, gTrue, gFalse, gFalse);
-+    sprintf(ppmFile, "%.*s-%06d.%s",
-+	    (int)sizeof(ppmFile) - 32, ppmRoot, pg,
-+	    mono ? "pbm" : gray ? "pgm" : "ppm");
-+    splashOut->getBitmap()->writePNMFile(ppmFile);
-+  }
-+  delete splashOut;
-+
-+  exitCode = 0;
-+
-+  // clean up
-+ err1:
-+  delete doc;
-+  delete globalParams;
-+ err0:
-+
-+  // check for memory leaks
-+  Object::memCheck(stderr);
-+  gMemReport(stderr);
-+
-+  return exitCode;
-+}
diff --git a/app-text/poppler/files/poppler-0.5.0-splash-overflow.patch b/app-text/poppler/files/poppler-0.5.0-splash-overflow.patch
deleted file mode 100644
index 9cc47d9dd6b6..000000000000
--- a/app-text/poppler/files/poppler-0.5.0-splash-overflow.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: xpdf/splash/Splash.cc
-===================================================================
---- xpdf/splash/Splash.cc	(revision 498958)
-+++ xpdf/splash/Splash.cc	(working copy)
-@@ -928,6 +928,10 @@ void Splash::drawPixel(int x, int y, Spl
-   int alpha2, ialpha2;
-   Guchar t;
- 
-+  if ( (unsigned) x >= (unsigned) bitmap->getWidth() ||
-+       (unsigned) y >= (unsigned) bitmap->getHeight())
-+    return;
-+
-   if (noClip || state->clip->test(x, y)) {
-     if (alpha != 1 || softMask || state->blendFunc) {
-       blendFunc = state->blendFunc ? state->blendFunc : &blendNormal;
-@@ -1195,6 +1199,11 @@ void Splash::drawSpan(int x0, int x1, in
-     updateModY(y);
-   }
- 
-+  if ((unsigned) x0 >= (unsigned) bitmap->getWidth() ||
-+      (unsigned) x1 >= (unsigned) bitmap->getWidth() ||
-+      (unsigned) y >= (unsigned) bitmap->getHeight())
-+    return;
-+
-   if (alpha != 1 || softMask || state->blendFunc) {
-     blendFunc = state->blendFunc ? state->blendFunc : &blendNormal;
-     if (softMask) {
-@@ -1825,6 +1834,11 @@ void Splash::xorSpan(int x0, int x1, int
-     updateModY(y);
-   }
- 
-+  if ((unsigned) x0 >= (unsigned) bitmap->getWidth() ||
-+      (unsigned) x1 >= (unsigned) bitmap->getWidth() ||
-+      (unsigned) y >= (unsigned) bitmap->getHeight())
-+    return;
-+
-   switch (bitmap->mode) {
-   case splashModeMono1:
-     p = &bitmap->data[y * bitmap->rowSize + (x0 >> 3)];
diff --git a/app-text/poppler/files/poppler-0.5.0-try-all-fonts.patch b/app-text/poppler/files/poppler-0.5.0-try-all-fonts.patch
deleted file mode 100644
index c30b0ff309c4..000000000000
--- a/app-text/poppler/files/poppler-0.5.0-try-all-fonts.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-diff --exclude-from=/home/dang/.diffrc -u -ruN poppler-0.5.0.orig/poppler/GlobalParams.cc poppler-0.5.0/poppler/GlobalParams.cc
---- poppler-0.5.0.orig/poppler/GlobalParams.cc	2005-12-21 14:43:55.000000000 -0500
-+++ poppler-0.5.0/poppler/GlobalParams.cc	2006-02-01 14:42:09.000000000 -0500
-@@ -1266,7 +1266,7 @@
- 
- DisplayFontParam *GlobalParams::getDisplayFont(GfxFont *font) {
-   DisplayFontParam *dfp;
--  FcPattern *p=0,*m=0;
-+  FcPattern *p=0;
- 
-   GooString *fontName = font->getName();
-   if (!fontName) return NULL;
-@@ -1275,44 +1275,49 @@
-   dfp = (DisplayFontParam *)displayFonts->lookup(fontName);
-   if (!dfp)
-   {
--    FcChar8* s;
--    char * ext;
--    FcResult res;
--    p = buildFcPattern(font);
--
--    if (!p)
--      goto fin;
--    FcConfigSubstitute(FCcfg, p, FcMatchPattern);
--    FcDefaultSubstitute(p);
--    m = FcFontMatch(FCcfg,p,&res);
--    if (!m)
--      goto fin; 
--    res = FcPatternGetString(m, FC_FILE, 0, &s);
--    if (res != FcResultMatch || !s)
--      goto fin; 
--    ext = strrchr((char*)s,'.');
--    if (!ext)
--      goto fin;
--    if (!strncasecmp(ext,".ttf",4))
--    {
--      dfp = new DisplayFontParam(fontName->copy(), displayFontTT);  
--      dfp->tt.fileName = new GooString((char*)s);
--    }
--    else if (!strncasecmp(ext,".pfa",4) || !strncasecmp(ext,".pfb",4)) 
--    {
--      dfp = new DisplayFontParam(fontName->copy(), displayFontT1);  
--      dfp->t1.fileName = new GooString((char*)s);
--    }
--    else
--      goto fin;
--    displayFonts->add(dfp->name,dfp);
--  }
--fin:
--  if (m)
--    FcPatternDestroy(m);
--  if (p)
--    FcPatternDestroy(p);
- 
-+      FcChar8* s;
-+      char * ext;
-+      FcResult res;
-+      FcFontSet *set;
-+      int i;
-+      p = buildFcPattern(font);
-+  
-+      if (!p)
-+        goto fin;
-+      FcConfigSubstitute(FCcfg, p, FcMatchPattern);
-+      FcDefaultSubstitute(p);
-+      set = FcFontSort(FCcfg, p, FcFalse, NULL, &res);
-+      if (!set)
-+        goto fin;
-+      for (i = 0; i < set->nfont; ++i)
-+      {
-+        res = FcPatternGetString(set->fonts[i], FC_FILE, 0, &s);
-+        if (res != FcResultMatch || !s)
-+          continue;
-+        ext = strrchr((char*)s,'.');
-+        if (!ext)
-+          continue;
-+        if (!strncasecmp(ext,".ttf",4) || !strncasecmp(ext,".ttc",4))
-+        {
-+          dfp = new DisplayFontParam(fontName->copy(), displayFontTT);  
-+          dfp->tt.fileName = new GooString((char*)s);
-+        }
-+        else if (!strncasecmp(ext,".pfa",4) || !strncasecmp(ext,".pfb",4)) 
-+        {
-+          dfp = new DisplayFontParam(fontName->copy(), displayFontT1);  
-+          dfp->t1.fileName = new GooString((char*)s);
-+        }
-+        else
-+          continue;
-+        displayFonts->add(dfp->name,dfp);
-+        break;
-+      }
-+      FcFontSetDestroy(set);
-+    }
-+  fin:
-+    if (p)
-+      FcPatternDestroy(p);
-   unlockGlobalParams;
-   return dfp;
- }