Fix compatibility with poppler-0.10.0, bug #239195. Thanks to Martin von Gagern <Martin.vGagern@gmx.net> for providing the patch. Also clean out old ebuilds and patches.

(Portage version: 2.2_rc12/cvs/Linux 2.6.27-rc8 x86_64)

7 files changed, 57 insertions, 785 deletions

diff --git a/app-text/xpdf/ChangeLog b/app-text/xpdf/ChangeLog
index ad3607bb0316..d471e0959b2a 100644
--- a/app-text/xpdf/ChangeLog
+++ b/app-text/xpdf/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-text/xpdf
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xpdf/ChangeLog,v 1.169 2008/08/02 07:32:15 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xpdf/ChangeLog,v 1.170 2008/10/14 21:12:27 loki_val Exp $
+
+  14 Oct 2008; Peter Alfredsen <loki_val@gentoo.org>
+  -files/poppler-0.5.9.patch, +files/poppler-0.10.0.patch,
+  -files/xpdf-3.01-poppler-0.5.1.patch,
+  -files/xpdf-3.01-poppler-nodrm.patch, -xpdf-3.01-r8.ebuild,
+  xpdf-3.02-r1.ebuild:
+  Fix compatibility with poppler-0.10.0, bug #239195. Thanks to Martin von
+  Gagern <Martin.vGagern@gmx.net> for providing the patch. Also clean out
+  old ebuilds and patches.
 
   02 Aug 2008; Ulrich Mueller <ulm@gentoo.org> metadata.xml:
   Add USE flag description to metadata wrt GLEP 56.
diff --git a/app-text/xpdf/files/poppler-0.10.0.patch b/app-text/xpdf/files/poppler-0.10.0.patch
new file mode 100644
index 000000000000..fcf0d7f06195
--- /dev/null
+++ b/app-text/xpdf/files/poppler-0.10.0.patch
@@ -0,0 +1,42 @@
+diff -pur --exclude='*~' xpdf-3.02-poppler.orig/config.h xpdf-3.02-poppler/config.h
+--- xpdf-3.02-poppler.orig/config.h	2008-10-14 20:00:41.000000000 +0200
++++ xpdf-3.02-poppler/config.h	2008-10-14 21:08:15.000000000 +0200
+@@ -28,6 +28,7 @@
+ #define supportedPDFVersionNum 1.7
+ 
+ // copyright notice
++#undef xpdfCopyright
+ #define xpdfCopyright "Copyright 1996-2007 Glyph & Cog, LLC"
+ 
+ // Windows resource file stuff
+diff -pur --exclude='*~' xpdf-3.02-poppler.orig/XPDFCore.cc xpdf-3.02-poppler/XPDFCore.cc
+--- xpdf-3.02-poppler.orig/XPDFCore.cc	2008-10-14 20:00:41.000000000 +0200
++++ xpdf-3.02-poppler/XPDFCore.cc	2008-10-14 21:13:48.000000000 +0200
+@@ -22,6 +22,7 @@
+ #include "GlobalParams.h"
+ #include "PDFDoc.h"
+ #include "Link.h"
++#include "FileSpec.h"
+ #include "ErrorCodes.h"
+ #include "GfxState.h"
+ #include "CoreOutputDev.h"
+@@ -465,7 +466,7 @@ void XPDFCore::doAction(LinkAction *acti
+   GooString *fileName, *fileName2;
+   GooString *cmd;
+   GooString *actionName;
+-  Object movieAnnot, obj1, obj2;
++  Object movieAnnot, obj1, obj2, obj3;
+   GooString *msg;
+   int i;
+ 
+@@ -631,7 +632,9 @@ void XPDFCore::doAction(LinkAction *acti
+     if (movieAnnot.isDict()) {
+       if (movieAnnot.dictLookup("Movie", &obj1)->isDict()) {
+ 	if (obj1.dictLookup("F", &obj2)) {
+-	  if ((fileName = LinkAction::getFileSpecName(&obj2))) {
++	  if (getFileSpecNameForPlatform(&obj2, &obj3)) {
++	    fileName = obj3.getString()->copy();
++	    obj3.free();
+ 	    if (!isAbsolutePath(fileName->getCString())) {
+ 	      fileName2 = appendToPath(
+ 			      grabPath(doc->getFileName()->getCString()),
diff --git a/app-text/xpdf/files/poppler-0.5.9.patch b/app-text/xpdf/files/poppler-0.5.9.patch
deleted file mode 100644
index feae721edaa3..000000000000
--- a/app-text/xpdf/files/poppler-0.5.9.patch
+++ /dev/null
@@ -1,451 +0,0 @@
-diff -up /usr/src/debug/app-text/xpdf-3.01-r8/xpdf-3.01-poppler/PDFCore.cc ./PDFCore.cc
---- /usr/src/debug/app-text/xpdf-3.01-r8/xpdf-3.01-poppler/PDFCore.cc	2006-12-15 10:25:24.000000000 +0000
-+++ ./PDFCore.cc	2007-06-24 00:56:10.000000000 +0100
-@@ -81,7 +81,6 @@ PDFCore::PDFCore(SplashColorMode colorMo
-   int i;
- 
-   doc = NULL;
--  continuousMode = globalParams->getContinuousView();
-   drawAreaWidth = drawAreaHeight = 0;
-   maxPageW = totalDocH = 0;
-   pageY = NULL;
-@@ -791,7 +790,7 @@ void PDFCore::needTile(PDFCorePage *page
-   memcpy(tile->ctm, out->getDefCTM(), 6 * sizeof(double));
-   memcpy(tile->ictm, out->getDefICTM(), 6 * sizeof(double));
-   if (!page->links) {
--    page->links = doc->takeLinks();
-+    page->links = doc->getLinks(page->page);
-   }
-   if (!page->text) {
-     if ((textOut = new TextOutputDev(NULL, gTrue, gFalse, gFalse))) {
-@@ -851,7 +850,7 @@ GBool PDFCore::gotoPrevPage(int dec, GBo
-   return gTrue;
- }
- 
--GBool PDFCore::gotoNamedDestination(UGooString *dest) {
-+GBool PDFCore::gotoNamedDestination(GooString *dest) {
-   LinkDest *d;
- 
-   if (!doc) {
-@@ -1213,7 +1212,7 @@ void PDFCore::xorRectangle(int pg, int x
-     for (i = 0; i < page->tiles->getLength(); ++i) {
-       tile = (PDFCoreTile *)page->tiles->get(i);
-       if (!oneTile || tile == oneTile) {
--	splash = new Splash(tile->bitmap);
-+	splash = new Splash(tile->bitmap, gFalse);
- 	splash->setFillPattern(pattern->copy());
- 	xx0 = (SplashCoord)(x0 - tile->xMin);
- 	yy0 = (SplashCoord)(y0 - tile->yMin);
-@@ -1584,7 +1583,7 @@ void PDFCore::cvtUserToDev(int pg, doubl
- 		tile->ctm[3] * yu + tile->ctm[5] + 0.5);
-   } else {
-     doc->getCatalog()->getPage(pg)->getDefaultCTM(ctm, dpi, dpi, rotate,
--						  out->upsideDown());
-+												  gFalse, out->upsideDown());
-     *xd = (int)(ctm[0] * xu + ctm[2] * yu + ctm[4] + 0.5);
-     *yd = (int)(ctm[1] * xu + ctm[3] * yu + ctm[5] + 0.5);
-   }
-diff -up /usr/src/debug/app-text/xpdf-3.01-r8/xpdf-3.01-poppler/PDFCore.h ./PDFCore.h
---- /usr/src/debug/app-text/xpdf-3.01-r8/xpdf-3.01-poppler/PDFCore.h	2006-12-15 10:25:24.000000000 +0000
-+++ ./PDFCore.h	2007-06-24 00:57:36.000000000 +0100
-@@ -16,7 +16,7 @@
- #include <stdlib.h>
- #include "SplashTypes.h"
- #include "CharTypes.h"
--#include "UGooString.h"
-+#include "GooString.h"
- 
- class GooString;
- class GooList;
-@@ -156,7 +156,7 @@ public:
- 
-   virtual GBool gotoNextPage(int inc, GBool top);
-   virtual GBool gotoPrevPage(int dec, GBool top, GBool bottom);
--  virtual GBool gotoNamedDestination(UGooString *dest);
-+  virtual GBool gotoNamedDestination(GooString *dest);
-   virtual GBool goForward();
-   virtual GBool goBackward();
-   virtual void scrollLeft(int nCols = 1);
-diff -up /usr/src/debug/app-text/xpdf-3.01-r8/xpdf-3.01-poppler/XPDFApp.cc ./XPDFApp.cc
---- /usr/src/debug/app-text/xpdf-3.01-r8/xpdf-3.01-poppler/XPDFApp.cc	2006-12-15 10:25:24.000000000 +0000
-+++ ./XPDFApp.cc	2007-06-24 00:42:27.000000000 +0100
-@@ -236,7 +236,7 @@ XPDFViewer *XPDFApp::open(GooString *fil
-   return viewer;
- }
- 
--XPDFViewer *XPDFApp::openAtDest(GooString *fileName, UGooString *dest,
-+XPDFViewer *XPDFApp::openAtDest(GooString *fileName, GooString *dest,
- 				GooString *ownerPassword,
- 				GooString *userPassword) {
-   XPDFViewer *viewer;
-@@ -324,7 +324,7 @@ void XPDFApp::remoteOpen(GooString *file
-   XFlush(display);
- }
- 
--void XPDFApp::remoteOpenAtDest(GooString *fileName, UGooString *dest, GBool raise) {
-+void XPDFApp::remoteOpenAtDest(GooString *fileName, GooString *dest, GBool raise) {
-   char cmd[remoteCmdSize];
- 
-   sprintf(cmd, "%c +%.256s %.200s",
-@@ -362,7 +362,7 @@ void XPDFApp::remoteMsgCbk(Widget widget
-   char *p, *q;
-   GooString *fileName;
-   int page;
--  UGooString *destName;
-+  GooString *destName;
- 
-   if (event->xproperty.atom != app->remoteAtom) {
-     *cont = True;
-@@ -393,7 +393,7 @@ void XPDFApp::remoteMsgCbk(Widget widget
-     page = 1;
-     destName = NULL;
-     if (*p == '+') {
--      destName = new UGooString(p + 1);
-+      destName = new GooString(p + 1);
-     } else {
-       page = atoi(p);
-     }
-diff -up /usr/src/debug/app-text/xpdf-3.01-r8/xpdf-3.01-poppler/XPDFApp.h ./XPDFApp.h
---- /usr/src/debug/app-text/xpdf-3.01-r8/xpdf-3.01-poppler/XPDFApp.h	2006-12-15 10:25:24.000000000 +0000
-+++ ./XPDFApp.h	2007-06-24 00:41:59.000000000 +0100
-@@ -18,7 +18,7 @@
- #undef Object
- #include "gtypes.h"
- #include "SplashTypes.h"
--#include "UGooString.h"
-+#include "GooString.h"
- 
- class GooString;
- class GooList;
-@@ -41,7 +41,7 @@ public:
-   XPDFViewer *open(GooString *fileName, int page = 1,
- 		   GooString *ownerPassword = NULL,
- 		   GooString *userPassword = NULL);
--  XPDFViewer *openAtDest(GooString *fileName, UGooString *dest,
-+  XPDFViewer *openAtDest(GooString *fileName, GooString *dest,
- 			 GooString *ownerPassword = NULL,
- 			 GooString *userPassword = NULL);
-   void close(XPDFViewer *viewer, GBool closeLast);
-@@ -53,7 +53,7 @@ public:
-   void setRemoteName(char *remoteName);
-   GBool remoteServerRunning();
-   void remoteOpen(GooString *fileName, int page, GBool raise);
--  void remoteOpenAtDest(GooString *fileName, UGooString *dest, GBool raise);
-+  void remoteOpenAtDest(GooString *fileName, GooString *dest, GBool raise);
-   void remoteReload(GBool raise);
-   void remoteRaise();
-   void remoteQuit();
-diff -up /usr/src/debug/app-text/xpdf-3.01-r8/xpdf-3.01-poppler/xpdf.cc ./xpdf.cc
---- /usr/src/debug/app-text/xpdf-3.01-r8/xpdf-3.01-poppler/xpdf.cc	2006-12-15 10:25:24.000000000 +0000
-+++ ./xpdf.cc	2007-06-24 00:55:50.000000000 +0100
-@@ -127,7 +127,7 @@ int main(int argc, char *argv[]) {
-   XPDFApp *app;
-   GooString *fileName;
-   int pg;
--  UGooString *destName;
-+  GooString *destName;
-   GooString *userPasswordStr, *ownerPasswordStr;
-   GBool ok;
-   int exitCode;
-@@ -148,26 +148,8 @@ int main(int argc, char *argv[]) {
-   }
- 
-   // read config file
--  globalParams = new GlobalParams(cfgFileName);
-+  globalParams = new GlobalParams();
-   //globalParams->setupBaseFonts(NULL);
--  if (contView) {
--    globalParams->setContinuousView(contView);
--  }
--  if (psFileArg[0]) {
--    globalParams->setPSFile(psFileArg);
--  }
--  if (paperSize[0]) {
--    if (!globalParams->setPSPaperSize(paperSize)) {
--      fprintf(stderr, "Invalid paper size\n");
--    }
--  } else {
--    if (paperWidth) {
--      globalParams->setPSPaperWidth(paperWidth);
--    }
--    if (paperHeight) {
--      globalParams->setPSPaperHeight(paperHeight);
--    }
--  }
-   if (level1) {
-     globalParams->setPSLevel(psLevel1);
-   }
-@@ -179,11 +161,6 @@ int main(int argc, char *argv[]) {
-       fprintf(stderr, "Bad '-eol' value on command line\n");
-     }
-   }
--  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");
-@@ -204,12 +181,6 @@ int main(int argc, char *argv[]) {
-   // create the XPDFApp object
-   app = new XPDFApp(&argc, argv);
- 
--  // the initialZoom parameter can be set in either the config file or
--  // as an X resource (or command line arg)
--  if (app->getInitialZoom()) {
--    globalParams->setInitialZoom(app->getInitialZoom()->getCString());
--  }
--
-   // check command line
-   ok = ok && argc >= 1 && argc <= 3;
-   if (doRemoteReload) {
-@@ -239,7 +210,7 @@ int main(int argc, char *argv[]) {
-   destName = NULL;
-   if (argc == 3) {
-     if (argv[2][0] == '+') {
--      destName = new UGooString(&argv[2][1]);
-+      destName = new GooString(&argv[2][1]);
-     } else {
-       pg = atoi(argv[2]);
-       if (pg < 0) {
-diff -up /usr/src/debug/app-text/xpdf-3.01-r8/xpdf-3.01-poppler/XPDFCore.cc ./XPDFCore.cc
---- /usr/src/debug/app-text/xpdf-3.01-r8/xpdf-3.01-poppler/XPDFCore.cc	2006-12-15 10:25:24.000000000 +0000
-+++ ./XPDFCore.cc	2007-06-24 00:57:05.000000000 +0100
-@@ -148,19 +148,7 @@ XPDFCore::XPDFCore(Widget shellA, Widget
-   drawAreaFrame = NULL;
-   drawArea = NULL;
- 
--  // get the initial zoom value
--  initialZoom = globalParams->getInitialZoom();
--  if (!initialZoom->cmp("page")) {
--    zoom = zoomPage;
--  } else if (!initialZoom->cmp("width")) {
--    zoom = zoomWidth;
--  } else {
--    zoom = atoi(initialZoom->getCString());
--    if (zoom <= 0) {
-       zoom = defZoom;
--    }
--  }
--  delete initialZoom;
- 
-   linkAction = NULL;
- 
-@@ -442,7 +430,7 @@ GBool XPDFCore::doLink(int pg, int x, in
- void XPDFCore::doAction(LinkAction *action) {
-   LinkActionKind kind;
-   LinkDest *dest;
--  UGooString *namedDest;
-+  GooString *namedDest;
-   char *s;
-   GooString *fileName, *fileName2;
-   GooString *cmd;
-@@ -462,7 +450,7 @@ void XPDFCore::doAction(LinkAction *acti
-       if ((dest = ((LinkGoTo *)action)->getDest())) {
- 	dest = dest->copy();
-       } else if ((namedDest = ((LinkGoTo *)action)->getNamedDest())) {
--	namedDest = new UGooString(*namedDest);
-+	namedDest = new GooString(*namedDest);
-       }
-     } else {
-       dest = NULL;
-@@ -470,7 +458,7 @@ void XPDFCore::doAction(LinkAction *acti
-       if ((dest = ((LinkGoToR *)action)->getDest())) {
- 	dest = dest->copy();
-       } else if ((namedDest = ((LinkGoToR *)action)->getNamedDest())) {
--	namedDest = new UGooString(*namedDest);
-+	namedDest = new GooString(*namedDest);
-       }
-       s = ((LinkGoToR *)action)->getFileName()->getCString();
-       //~ translate path name for VMS (deal with '/')
-@@ -548,12 +536,8 @@ void XPDFCore::doAction(LinkAction *acti
- 
-   // URI action
-   case actionURI:
--    if (!(cmd = globalParams->getURLCommand())) {
-       error(-1, "No urlCommand defined in config file");
-       break;
--    }
--    runCommand(cmd, ((LinkURI *)action)->getURI());
--    break;
- 
-   // Named action
-   case actionNamed:
-@@ -585,52 +569,8 @@ void XPDFCore::doAction(LinkAction *acti
- 
-   // Movie action
-   case actionMovie:
--    if (!(cmd = globalParams->getMovieCommand())) {
-       error(-1, "No movieCommand defined in config file");
-       break;
--    }
--    if (((LinkMovie *)action)->hasAnnotRef()) {
--      doc->getXRef()->fetch(((LinkMovie *)action)->getAnnotRef()->num,
--			    ((LinkMovie *)action)->getAnnotRef()->gen,
--			    &movieAnnot);
--    } else {
--      //~ need to use the correct page num here
--      doc->getCatalog()->getPage(topPage)->getAnnots(&obj1);
--      if (obj1.isArray()) {
--	for (i = 0; i < obj1.arrayGetLength(); ++i) {
--	  if (obj1.arrayGet(i, &movieAnnot)->isDict()) {
--	    if (movieAnnot.dictLookup("Subtype", &obj2)->isName("Movie")) {
--	      obj2.free();
--	      break;
--	    }
--	    obj2.free();
--	  }
--	  movieAnnot.free();
--	}
--	obj1.free();
--      }
--    }
--    if (movieAnnot.isDict()) {
--      if (movieAnnot.dictLookup("Movie", &obj1)->isDict()) {
--	if (obj1.dictLookup("F", &obj2)) {
--	  if ((fileName = LinkAction::getFileSpecName(&obj2))) {
--	    if (!isAbsolutePath(fileName->getCString())) {
--	      fileName2 = appendToPath(
--			      grabPath(doc->getFileName()->getCString()),
--			      fileName->getCString());
--	      delete fileName;
--	      fileName = fileName2;
--	    }
--	    runCommand(cmd, fileName);
--	    delete fileName;
--	  }
--	  obj2.free();
--	}
--	obj1.free();
--      }
--    }
--    movieAnnot.free();
--    break;
- 
-   // unknown action type
-   case actionUnknown:
-diff -up /usr/src/debug/app-text/xpdf-3.01-r8/xpdf-3.01-poppler/XPDFViewer.cc ./XPDFViewer.cc
---- /usr/src/debug/app-text/xpdf-3.01-r8/xpdf-3.01-poppler/XPDFViewer.cc	2006-12-15 10:25:24.000000000 +0000
-+++ ./XPDFViewer.cc	2007-06-24 00:57:28.000000000 +0100
-@@ -111,7 +111,7 @@ static ZoomMenuInfo zoomMenuInfo[nZoomMe
- //------------------------------------------------------------------------
- 
- XPDFViewer::XPDFViewer(XPDFApp *appA, GooString *fileName,
--		       int pageA, UGooString *destName,
-+		       int pageA, GooString *destName,
- 		       GooString *ownerPassword, GooString *userPassword) {
-   LinkDest *dest;
-   int pg;
-@@ -185,7 +185,7 @@ XPDFViewer::~XPDFViewer() {
- #endif
- }
- 
--void XPDFViewer::open(GooString *fileName, int pageA, UGooString *destName) {
-+void XPDFViewer::open(GooString *fileName, int pageA, GooString *destName) {
-   LinkDest *dest;
-   int pg;
-   double z;
-@@ -267,7 +267,7 @@ void XPDFViewer::displayDest(LinkDest *d
-   core->displayDest(dest, zoomA, rotateA, addToHist);
- }
- 
--void XPDFViewer::getPageAndDest(int pageA, UGooString *destName,
-+void XPDFViewer::getPageAndDest(int pageA, GooString *destName,
- 				int *pageOut, LinkDest **destOut) {
-   Ref pageRef;
- 
-@@ -2299,16 +2299,6 @@ void XPDFViewer::initPrintDialog() {
-   XtSetArg(args[n], XmNcancelButton, cancelBtn); ++n;
-   XtSetValues(printDialog, args, n);
- 
--  //----- initial values
--  if ((psFileName = globalParams->getPSFile())) {
--    if (psFileName->getChar(0) == '|') {
--      XmTextFieldSetString(printCmdText,
--			   psFileName->getCString() + 1);
--    } else {
--      XmTextFieldSetString(printFileText, psFileName->getCString());
--    }
--    delete psFileName;
--  }
- }
- 
- void XPDFViewer::setupPrintDialog() {
-@@ -2318,34 +2308,10 @@ void XPDFViewer::setupPrintDialog() {
-   char *p;
- 
-   doc = core->getDoc();
--  psFileName = globalParams->getPSFile();
--  if (!psFileName || psFileName->getChar(0) == '|') {
--    pdfFileName = doc->getFileName();
--    p = pdfFileName->getCString() + pdfFileName->getLength() - 4;
--    if (!strcmp(p, ".pdf") || !strcmp(p, ".PDF")) {
--      psFileName2 = new GooString(pdfFileName->getCString(),
--				pdfFileName->getLength() - 4);
--    } else {
--      psFileName2 = pdfFileName->copy();
--    }
--    psFileName2->append(".ps");
--    XmTextFieldSetString(printFileText, psFileName2->getCString());
--    delete psFileName2;
--  }
--  if (psFileName && psFileName->getChar(0) == '|') {
--    XmToggleButtonSetState(printWithCmdBtn, True, False);
--    XmToggleButtonSetState(printToFileBtn, False, False);
--    XtVaSetValues(printCmdText, XmNsensitive, True, NULL);
--    XtVaSetValues(printFileText, XmNsensitive, False, NULL);
--  } else {
-     XmToggleButtonSetState(printWithCmdBtn, False, False);
-     XmToggleButtonSetState(printToFileBtn, True, False);
-     XtVaSetValues(printCmdText, XmNsensitive, False, NULL);
-     XtVaSetValues(printFileText, XmNsensitive, True, NULL);
--  }
--  if (psFileName) {
--    delete psFileName;
--  }
- 
-   sprintf(buf, "%d", doc->getNumPages());
-   XmTextFieldSetString(printFirstPage, "1");
-@@ -2419,11 +2385,11 @@ void XPDFViewer::printPrintCbk(Widget wi
-   }
- 
-   psOut = new PSOutputDev(psFileName->getCString(), doc->getXRef(),
--			  doc->getCatalog(), firstPage, lastPage,
--			  psModePS);
-+			  doc->getCatalog(), NULL, firstPage, lastPage,
-+			  psModePS, 0, 0, gFalse, 0, 0, 0, 0, gFalse, gFalse);
-   if (psOut->isOk()) {
-     doc->displayPages(psOut, firstPage, lastPage, 72, 72,
--		      0, gTrue, globalParams->getPSCrop(), gFalse);
-+		      0, gTrue, gFalse, gFalse);
-   }
-   delete psOut;
-   delete psFileName;
-diff -up /usr/src/debug/app-text/xpdf-3.01-r8/xpdf-3.01-poppler/XPDFViewer.h ./XPDFViewer.h
---- /usr/src/debug/app-text/xpdf-3.01-r8/xpdf-3.01-poppler/XPDFViewer.h	2006-12-15 10:25:24.000000000 +0000
-+++ ./XPDFViewer.h	2007-06-24 00:42:16.000000000 +0100
-@@ -48,12 +48,12 @@ class XPDFViewer {
- public:
- 
-   XPDFViewer(XPDFApp *appA, GooString *fileName,
--	     int pageA, UGooString *destName,
-+	     int pageA, GooString *destName,
- 	     GooString *ownerPassword, GooString *userPassword);
-   GBool isOk() { return ok; }
-   ~XPDFViewer();
- 
--  void open(GooString *fileName, int pageA, UGooString *destName);
-+  void open(GooString *fileName, int pageA, GooString *destName);
-   void clear();
-   void reloadFile();
- 
-@@ -68,7 +68,7 @@ private:
-                    GBool scrollToTop, GBool addToHist);
-   void displayDest(LinkDest *dest, double zoomA, int rotateA,
- 		   GBool addToHist);
--  void getPageAndDest(int pageA, UGooString *destName,
-+  void getPageAndDest(int pageA, GooString *destName,
- 		      int *pageOut, LinkDest **destOut);
- 
-   //----- actions
diff --git a/app-text/xpdf/files/xpdf-3.01-poppler-0.5.1.patch b/app-text/xpdf/files/xpdf-3.01-poppler-0.5.1.patch
deleted file mode 100644
index 9991ec8b688c..000000000000
--- a/app-text/xpdf/files/xpdf-3.01-poppler-0.5.1.patch
+++ /dev/null
@@ -1,208 +0,0 @@
-diff -Naur xpdf-3.01-poppler.orig/PDFCore.cc xpdf-3.01-poppler/PDFCore.cc
---- xpdf-3.01-poppler.orig/PDFCore.cc	2006-02-03 20:24:22.000000000 +0100
-+++ xpdf-3.01-poppler/PDFCore.cc	2006-03-18 20:52:00.000000000 +0100
-@@ -851,7 +851,7 @@
-   return gTrue;
- }
- 
--GBool PDFCore::gotoNamedDestination(GooString *dest) {
-+GBool PDFCore::gotoNamedDestination(UGooString *dest) {
-   LinkDest *d;
- 
-   if (!doc) {
-diff -Naur xpdf-3.01-poppler.orig/PDFCore.h xpdf-3.01-poppler/PDFCore.h
---- xpdf-3.01-poppler.orig/PDFCore.h	2006-02-03 20:22:22.000000000 +0100
-+++ xpdf-3.01-poppler/PDFCore.h	2006-03-18 20:52:42.000000000 +0100
-@@ -16,6 +16,7 @@
- #include <stdlib.h>
- #include "SplashTypes.h"
- #include "CharTypes.h"
-+#include "UGooString.h"
- 
- class GooString;
- class GooList;
-@@ -155,7 +156,7 @@
- 
-   virtual GBool gotoNextPage(int inc, GBool top);
-   virtual GBool gotoPrevPage(int dec, GBool top, GBool bottom);
--  virtual GBool gotoNamedDestination(GooString *dest);
-+  virtual GBool gotoNamedDestination(UGooString *dest);
-   virtual GBool goForward();
-   virtual GBool goBackward();
-   virtual void scrollLeft(int nCols = 1);
-diff -Naur xpdf-3.01-poppler.orig/XPDFApp.cc xpdf-3.01-poppler/XPDFApp.cc
---- xpdf-3.01-poppler.orig/XPDFApp.cc	2006-02-03 20:27:48.000000000 +0100
-+++ xpdf-3.01-poppler/XPDFApp.cc	2006-03-18 21:03:17.000000000 +0100
-@@ -236,7 +236,7 @@
-   return viewer;
- }
- 
--XPDFViewer *XPDFApp::openAtDest(GooString *fileName, GooString *dest,
-+XPDFViewer *XPDFApp::openAtDest(GooString *fileName, UGooString *dest,
- 				GooString *ownerPassword,
- 				GooString *userPassword) {
-   XPDFViewer *viewer;
-@@ -324,7 +324,7 @@
-   XFlush(display);
- }
- 
--void XPDFApp::remoteOpenAtDest(GooString *fileName, GooString *dest, GBool raise) {
-+void XPDFApp::remoteOpenAtDest(GooString *fileName, UGooString *dest, GBool raise) {
-   char cmd[remoteCmdSize];
- 
-   sprintf(cmd, "%c +%.256s %.200s",
-@@ -362,7 +362,7 @@
-   char *p, *q;
-   GooString *fileName;
-   int page;
--  GooString *destName;
-+  UGooString *destName;
- 
-   if (event->xproperty.atom != app->remoteAtom) {
-     *cont = True;
-@@ -393,7 +393,7 @@
-     page = 1;
-     destName = NULL;
-     if (*p == '+') {
--      destName = new GooString(p + 1);
-+      destName = new UGooString(p + 1);
-     } else {
-       page = atoi(p);
-     }
-diff -Naur xpdf-3.01-poppler.orig/XPDFApp.h xpdf-3.01-poppler/XPDFApp.h
---- xpdf-3.01-poppler.orig/XPDFApp.h	2006-02-03 20:22:34.000000000 +0100
-+++ xpdf-3.01-poppler/XPDFApp.h	2006-03-18 21:05:47.000000000 +0100
-@@ -18,6 +18,7 @@
- #undef Object
- #include "gtypes.h"
- #include "SplashTypes.h"
-+#include "UGooString.h"
- 
- class GooString;
- class GooList;
-@@ -40,7 +41,7 @@
-   XPDFViewer *open(GooString *fileName, int page = 1,
- 		   GooString *ownerPassword = NULL,
- 		   GooString *userPassword = NULL);
--  XPDFViewer *openAtDest(GooString *fileName, GooString *dest,
-+  XPDFViewer *openAtDest(GooString *fileName, UGooString *dest,
- 			 GooString *ownerPassword = NULL,
- 			 GooString *userPassword = NULL);
-   void close(XPDFViewer *viewer, GBool closeLast);
-@@ -52,7 +53,7 @@
-   void setRemoteName(char *remoteName);
-   GBool remoteServerRunning();
-   void remoteOpen(GooString *fileName, int page, GBool raise);
--  void remoteOpenAtDest(GooString *fileName, GooString *dest, GBool raise);
-+  void remoteOpenAtDest(GooString *fileName, UGooString *dest, GBool raise);
-   void remoteReload(GBool raise);
-   void remoteRaise();
-   void remoteQuit();
-diff -Naur xpdf-3.01-poppler.orig/xpdf.cc xpdf-3.01-poppler/xpdf.cc
---- xpdf-3.01-poppler.orig/xpdf.cc	2006-02-03 20:30:23.000000000 +0100
-+++ xpdf-3.01-poppler/xpdf.cc	2006-03-18 21:04:30.000000000 +0100
-@@ -127,7 +127,7 @@
-   XPDFApp *app;
-   GooString *fileName;
-   int pg;
--  GooString *destName;
-+  UGooString *destName;
-   GooString *userPasswordStr, *ownerPasswordStr;
-   GBool ok;
-   int exitCode;
-@@ -239,7 +239,7 @@
-   destName = NULL;
-   if (argc == 3) {
-     if (argv[2][0] == '+') {
--      destName = new GooString(&argv[2][1]);
-+      destName = new UGooString(&argv[2][1]);
-     } else {
-       pg = atoi(argv[2]);
-       if (pg < 0) {
-diff -Naur xpdf-3.01-poppler.orig/XPDFCore.cc xpdf-3.01-poppler/XPDFCore.cc
---- xpdf-3.01-poppler.orig/XPDFCore.cc	2006-02-03 21:37:06.000000000 +0100
-+++ xpdf-3.01-poppler/XPDFCore.cc	2006-03-18 20:59:10.000000000 +0100
-@@ -442,7 +442,7 @@
- void XPDFCore::doAction(LinkAction *action) {
-   LinkActionKind kind;
-   LinkDest *dest;
--  GooString *namedDest;
-+  UGooString *namedDest;
-   char *s;
-   GooString *fileName, *fileName2;
-   GooString *cmd;
-@@ -462,7 +462,7 @@
-       if ((dest = ((LinkGoTo *)action)->getDest())) {
- 	dest = dest->copy();
-       } else if ((namedDest = ((LinkGoTo *)action)->getNamedDest())) {
--	namedDest = namedDest->copy();
-+	namedDest = new UGooString(*namedDest);
-       }
-     } else {
-       dest = NULL;
-@@ -470,7 +470,7 @@
-       if ((dest = ((LinkGoToR *)action)->getDest())) {
- 	dest = dest->copy();
-       } else if ((namedDest = ((LinkGoToR *)action)->getNamedDest())) {
--	namedDest = namedDest->copy();
-+	namedDest = new UGooString(*namedDest);
-       }
-       s = ((LinkGoToR *)action)->getFileName()->getCString();
-       //~ translate path name for VMS (deal with '/')
-diff -Naur xpdf-3.01-poppler.orig/XPDFViewer.cc xpdf-3.01-poppler/XPDFViewer.cc
---- xpdf-3.01-poppler.orig/XPDFViewer.cc	2006-02-03 20:31:24.000000000 +0100
-+++ xpdf-3.01-poppler/XPDFViewer.cc	2006-03-18 21:01:32.000000000 +0100
-@@ -111,7 +111,7 @@
- //------------------------------------------------------------------------
- 
- XPDFViewer::XPDFViewer(XPDFApp *appA, GooString *fileName,
--		       int pageA, GooString *destName,
-+		       int pageA, UGooString *destName,
- 		       GooString *ownerPassword, GooString *userPassword) {
-   LinkDest *dest;
-   int pg;
-@@ -185,7 +185,7 @@
- #endif
- }
- 
--void XPDFViewer::open(GooString *fileName, int pageA, GooString *destName) {
-+void XPDFViewer::open(GooString *fileName, int pageA, UGooString *destName) {
-   LinkDest *dest;
-   int pg;
-   double z;
-@@ -267,7 +267,7 @@
-   core->displayDest(dest, zoomA, rotateA, addToHist);
- }
- 
--void XPDFViewer::getPageAndDest(int pageA, GooString *destName,
-+void XPDFViewer::getPageAndDest(int pageA, UGooString *destName,
- 				int *pageOut, LinkDest **destOut) {
-   Ref pageRef;
- 
-diff -Naur xpdf-3.01-poppler.orig/XPDFViewer.h xpdf-3.01-poppler/XPDFViewer.h
---- xpdf-3.01-poppler.orig/XPDFViewer.h	2006-02-03 20:22:57.000000000 +0100
-+++ xpdf-3.01-poppler/XPDFViewer.h	2006-03-18 21:01:17.000000000 +0100
-@@ -48,12 +48,12 @@
- public:
- 
-   XPDFViewer(XPDFApp *appA, GooString *fileName,
--	     int pageA, GooString *destName,
-+	     int pageA, UGooString *destName,
- 	     GooString *ownerPassword, GooString *userPassword);
-   GBool isOk() { return ok; }
-   ~XPDFViewer();
- 
--  void open(GooString *fileName, int pageA, GooString *destName);
-+  void open(GooString *fileName, int pageA, UGooString *destName);
-   void clear();
-   void reloadFile();
- 
-@@ -68,7 +68,7 @@
-                    GBool scrollToTop, GBool addToHist);
-   void displayDest(LinkDest *dest, double zoomA, int rotateA,
- 		   GBool addToHist);
--  void getPageAndDest(int pageA, GooString *destName,
-+  void getPageAndDest(int pageA, UGooString *destName,
- 		      int *pageOut, LinkDest **destOut);
- 
-   //----- actions
diff --git a/app-text/xpdf/files/xpdf-3.01-poppler-nodrm.patch b/app-text/xpdf/files/xpdf-3.01-poppler-nodrm.patch
deleted file mode 100644
index 8a752ac391ca..000000000000
--- a/app-text/xpdf/files/xpdf-3.01-poppler-nodrm.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff -ur xpdf-3.01-poppler.orig/PDFCore.cc xpdf-3.01-poppler/PDFCore.cc
---- xpdf-3.01-poppler.orig/PDFCore.cc	2006-02-04 19:59:02.000000000 +0100
-+++ xpdf-3.01-poppler/PDFCore.cc	2006-02-04 19:59:55.000000000 +0100
-@@ -1271,9 +1271,6 @@
-   int x0, y0, x1, y1, t;
-   GooString *s;
- 
--  if (!doc->okToCopy()) {
--    return NULL;
--  }
-   if ((page = findPage(pg))) {
-     cvtUserToDev(pg, xMin, yMin, &x0, &y0);
-     cvtUserToDev(pg, xMax, yMax, &x1, &y1);
-diff -ur xpdf-3.01-poppler.orig/XPDFCore.cc xpdf-3.01-poppler/XPDFCore.cc
---- xpdf-3.01-poppler.orig/XPDFCore.cc	2006-02-04 19:59:02.000000000 +0100
-+++ xpdf-3.01-poppler/XPDFCore.cc	2006-02-04 19:59:55.000000000 +0100
-@@ -376,9 +376,6 @@
-   int pg;
-   double ulx, uly, lrx, lry;
- 
--  if (!doc->okToCopy()) {
--    return;
--  }
-   if (getSelection(&pg, &ulx, &uly, &lrx, &lry)) {
-     //~ for multithreading: need a mutex here
-     if (currentSelection) {
-@@ -1115,11 +1112,7 @@
- #ifndef NO_TEXT_SELECT
- 	  if (core->selectULX != core->selectLRX &&
- 	      core->selectULY != core->selectLRY) {
--	    if (core->doc->okToCopy()) {
--	      core->copySelection();
--	    } else {
--	      error(-1, "Copying of text from this document is not allowed.");
--	    }
-+	    core->copySelection();
- 	  }
- #endif
- 	}
-diff -ur xpdf-3.01-poppler.orig/XPDFViewer.cc xpdf-3.01-poppler/XPDFViewer.cc
---- xpdf-3.01-poppler.orig/XPDFViewer.cc	2006-02-04 19:59:02.000000000 +0100
-+++ xpdf-3.01-poppler/XPDFViewer.cc	2006-02-04 19:59:55.000000000 +0100
-@@ -2390,10 +2390,6 @@
-   PSOutputDev *psOut;
- 
-   doc = viewer->core->getDoc();
--  if (!doc->okToPrint()) {
--    error(-1, "Printing this document is not allowed.");
--    return;
--  }
- 
-   viewer->core->setBusyCursor(gTrue);
- 
diff --git a/app-text/xpdf/xpdf-3.01-r8.ebuild b/app-text/xpdf/xpdf-3.01-r8.ebuild
deleted file mode 100644
index 3a984849c137..000000000000
--- a/app-text/xpdf/xpdf-3.01-r8.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xpdf/xpdf-3.01-r8.ebuild,v 1.20 2008/06/27 10:04:08 ulm Exp $
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="An X Viewer for PDF Files"
-HOMEPAGE="http://www.foolabs.com/xpdf/"
-SRC_URI="http://gentooexperimental.org/~genstef/dist/${P}-poppler.tar.bz2
-	linguas_ar? ( ftp://ftp.foolabs.com/pub/xpdf/xpdf-arabic-2003-feb-16.tar.gz )
-	linguas_zh_CN? ( ftp://ftp.foolabs.com/pub/xpdf/xpdf-chinese-simplified-2004-jul-27.tar.gz )
-	linguas_zh_TW? ( ftp://ftp.foolabs.com/pub/xpdf/xpdf-chinese-traditional-2004-jul-27.tar.gz )
-	linguas_ru? ( ftp://ftp.foolabs.com/pub/xpdf/xpdf-cyrillic-2003-jun-28.tar.gz )
-	linguas_el? ( ftp://ftp.foolabs.com/pub/xpdf/xpdf-greek-2003-jun-28.tar.gz )
-	linguas_he? ( ftp://ftp.foolabs.com/pub/xpdf/xpdf-hebrew-2003-feb-16.tar.gz )
-	linguas_ja? ( ftp://ftp.foolabs.com/pub/xpdf/xpdf-japanese-2004-jul-27.tar.gz )
-	linguas_ko? ( ftp://ftp.foolabs.com/pub/xpdf/xpdf-korean-2005-jul-07.tar.gz )
-	linguas_la? ( ftp://ftp.foolabs.com/pub/xpdf/xpdf-latin2-2002-oct-22.tar.gz )
-	linguas_th? ( ftp://ftp.foolabs.com/pub/xpdf/xpdf-thai-2002-jan-16.tar.gz )
-	linguas_tr? ( ftp://ftp.foolabs.com/pub/xpdf/xpdf-turkish-2002-apr-10.tar.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="nodrm linguas_ar linguas_zh_CN linguas_zh_TW linguas_ru linguas_el
-linguas_he linguas_ja linguas_ko linguas_la linguas_th linguas_tr"
-
-RDEPEND=">=app-text/poppler-0.5.1
-	x11-libs/openmotif
-	x11-libs/libX11
-	x11-libs/libXpm"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-S=${WORKDIR}/${P}-poppler
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	use nodrm && epatch "${FILESDIR}"/${P}-poppler-nodrm.patch
-	epatch "${FILESDIR}"/${P}-poppler-0.5.1.patch
-	has_version '>=app-text/poppler-0.5.9' && epatch "${FILESDIR}"/poppler-0.5.9.patch
-}
-
-src_install() {
-	dobin xpdf
-	doman xpdf.1 ${FILESDIR}/xpdfrc.5
-	insinto /etc
-	newins ${FILESDIR}/sample-xpdfrc xpdfrc
-	dodoc README ANNOUNCE CHANGES
-
-	use linguas_ar && install_lang arabic
-	use linguas_zh_CN && install_lang chinese-simplified
-	use linguas_zh_TW && install_lang chinese-traditional
-	use linguas_ru && install_lang cyrillic
-	use linguas_el && install_lang greek
-	use linguas_he && install_lang hebrew
-	use linguas_ja && install_lang japanese
-	use linguas_ko && install_lang korean
-	use linguas_la && install_lang latin2
-	use linguas_th && install_lang thai
-	use linguas_tr && install_lang turkish
-}
-
-install_lang() {
-	cd ../xpdf-$1
-	sed 's,/usr/local/share/xpdf/,/usr/share/xpdf/,g' add-to-xpdfrc >> ${D}/etc/xpdfrc
-	insinto /usr/share/xpdf/$1
-	doins -r *.unicodeMap *ToUnicode CMap
-}
diff --git a/app-text/xpdf/xpdf-3.02-r1.ebuild b/app-text/xpdf/xpdf-3.02-r1.ebuild
index 3d928799f950..f7b0cda0b6ab 100644
--- a/app-text/xpdf/xpdf-3.02-r1.ebuild
+++ b/app-text/xpdf/xpdf-3.02-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xpdf/xpdf-3.02-r1.ebuild,v 1.4 2008/06/27 10:04:08 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xpdf/xpdf-3.02-r1.ebuild,v 1.5 2008/10/14 21:12:27 loki_val Exp $
 
 inherit eutils flag-o-matic
 
@@ -37,7 +37,10 @@ S=${WORKDIR}/${P}-poppler
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	use nodrm && epatch "${FILESDIR}"/${P}-poppler-nodrm.patch
+	use nodrm && \
+		epatch "${FILESDIR}"/${P}-poppler-nodrm.patch
+	has_version '>=app-text/poppler-0.10.0' && \
+		epatch "${FILESDIR}"/poppler-0.10.0.patch
 }
 
 src_install() {