Removed in favour of app-text/poppler, which provides all the same functionality and commands, and is less vulnerable to flaws.

13 files changed, 0 insertions, 583 deletions

diff --git a/app-text/pdftohtml/ChangeLog b/app-text/pdftohtml/ChangeLog
deleted file mode 100644
index 28735f15af40..000000000000
--- a/app-text/pdftohtml/ChangeLog
+++ /dev/null
@@ -1,121 +0,0 @@
-# ChangeLog for app-text/pdftohtml
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/pdftohtml/ChangeLog,v 1.33 2006/01/08 22:01:29 nattfodd Exp $
-
-  08 Jan 2006; Alexandre Buisse <nattfodd@gentoo.org>
-  pdftohtml-0.36-r3.ebuild, pdftohtml-0.36-r4.ebuild:
-  Block poppler which also installs pdftohtml (bug #117839).
-
-  12 Dec 2005; Robin H. Johnson <robbat2@gentoo.org> metadata.xml:
-  Update metadata.xml.
-
-  07 Dec 2005; Gustavo Zacarias <gustavoz@gentoo.org>
-  pdftohtml-0.36-r4.ebuild:
-  Stable on sparc wrt #114428
-
-  07 Dec 2005; Markus Rothe <corsair@gentoo.org> pdftohtml-0.36-r4.ebuild:
-  Stable on ppc64; bug #114428
-
-  07 Dec 2005; <dang@gentoo.org> pdftohtml-0.36-r4.ebuild:
-  Marked stable on amd64
-
-  07 Dec 2005; Mark Loeser <halcy0n@gentoo.org> pdftohtml-0.36-r4.ebuild:
-  Stable on x86; bug #114428
-
-  06 Dec 2005; Michael Hanselmann <hansmi@gentoo.org>
-  pdftohtml-0.36-r4.ebuild:
-  Stable on ppc.
-
-*pdftohtml-0.36-r4 (06 Dec 2005)
-
-  06 Dec 2005; <dang@gentoo.org> +files/pdftohtml-0.36-CAN-2005-3193.patch,
-  +pdftohtml-0.36-r4.ebuild:
-  Fix for bug #114428
-
-  29 Oct 2005; Fabian Groffen <grobian@gentoo.org> pdftohtml-0.36-r3.ebuild:
-  Marked ~ppc-macos (bug #109429)
-
-  16 Mar 2005; Heinrich Wendel <lanius@gentoo.org> +metadata.xml,
-  -pdftohtml-0.36-r1.ebuild, -pdftohtml-0.36-r2.ebuild,
-  pdftohtml-0.36-r3.ebuild, -pdftohtml-0.36.ebuild:
-  fix location of xpdfrc bug #65728; stable on amd64; cleanups
-
-  09 Feb 2005; Gustavo Zacarias <gustavoz@gentoo.org>
-  pdftohtml-0.36-r3.ebuild:
-  Stable on sparc wrt #78629
-
-  08 Feb 2005; Olivier Crête <tester@gentoo.org> pdftohtml-0.36-r3.ebuild:
-  Stable on x86 wrt security bug #78629
-
-  05 Feb 2005; Markus Rothe <corsair@gentoo.org> pdftohtml-0.36-r3.ebuild:
-  Stable on ppc64; bug #78629
-
-  04 Feb 2005; Michael Hanselmann <hansmi@gentoo.org>
-  pdftohtml-0.36-r1.ebuild, pdftohtml-0.36-r2.ebuild,
-  pdftohtml-0.36-r3.ebuild, pdftohtml-0.36.ebuild:
-  Fixed HOMEPAGE.
-
-  04 Feb 2005; Michael Hanselmann <hansmi@gentoo.org>
-  pdftohtml-0.36-r3.ebuild:
-  Stable on ppc.
-
-*pdftohtml-0.36-r3 (04 Feb 2005)
-
-  04 Feb 2005; Robin H. Johnson <robbat2@gentoo.org>
-  +files/xpdf-3.00pl3-keylength.patch, +pdftohtml-0.36-r3.ebuild:
-  Bug #78629, more xpdf security problems.
-
-  09 Jan 2005; Jason Wever <weeve@gentoo.org> pdftohtml-0.36-r2.ebuild:
-  Stable on sparc wrt security bug #75200.
-
-  08 Jan 2005; Lars Weiler <pylon@gentoo.org> pdftohtml-0.36-r2.ebuild:
-  Stable on ppc; bug #75200.
-
-  07 Jan 2005; Markus Rothe <corsair@gentoo.org> pdftohtml-0.36-r2.ebuild:
-  Stable on ppc64
-
-*pdftohtml-0.36-r2 (07 Jan 2005)
-
-  07 Jan 2005; Robin H. Johnson <robbat2@gentoo.org>
-  +files/pdftohtml-xpdf-3.00pl2-CAN-2004-1125.patch,
-  +pdftohtml-0.36-r2.ebuild:
-  Bug #75200, security fix, stable on x86.
-
-*pdftohtml-0.36-r1 (22 Nov 2004)
-
-  22 Nov 2004; Robin H. Johnson <robbat2@gentoo.org>
-  +files/xpdf-CESA-2004-007-xpdf2-newer.diff, +files/xpdf-goo-sizet.patch,
-  +files/xpdf2-underflow.patch, +pdftohtml-0.36-r1.ebuild:
-  Bug #69019, security advisory for xpdf.
-
-  18 Oct 2004; Tom Gall <tgall@gentoo.org> pdftohtml-0.36.ebuild:
-  stable on ppc64, bug #64536
-
-  24 Sep 2004; Jodok Batlogg <batlogg@gentoo.org>; pdftohtml-0.36.ebuild:
-  marked stable on x86
-
-  31 Aug 2004; Tom Martin <slarti@gentoo.org> pdftohtml-0.36.ebuild:
-  Marked ~amd64, resolving bug 62388. Thanks to Dean Lamper <lampy@email.si> for
-  reporting.
-
-  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
-  pdftohtml-0.36.ebuild:
-  virtual/glibc -> virtual/libc
-
-  07 May 2004; Ciaran McCreesh <ciaranm@gentoo.org> pdftohtml-0.36.ebuild:
-  Stable on sparc, #50392
-
-  27 Mar 2004; David Holm <dholm@gentoo.org> pdftohtml-0.36.ebuild:
-  Added to ~ppc.
-
-  12 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> pdftohtml-0.36.ebuild:
-  Don't assign default to S; header fix
-
-  10 Mar 2004; Jason Wever <weeve@gentoo.org> pdftohtml-0.36.ebuild:
-  Added ~sparc keyword.
-
-*pdftohtml-0.36 (11 Oct 2003)
-
-  11 Oct 2003; Robin H. Johnson <robbat2@gentoo.org> pdftohtml-0.36.ebuild:
-  initial commit, ebuild by robbat2@gentoo.org
-
diff --git a/app-text/pdftohtml/Manifest b/app-text/pdftohtml/Manifest
deleted file mode 100644
index b6daa499fa5c..000000000000
--- a/app-text/pdftohtml/Manifest
+++ /dev/null
@@ -1,12 +0,0 @@
-MD5 5ba88d45246ea83eea61467dd4608110 ChangeLog 4123
-MD5 89167430147d99e86ca445b23be50f1b files/digest-pdftohtml-0.36-r3 66
-MD5 89167430147d99e86ca445b23be50f1b files/digest-pdftohtml-0.36-r4 66
-MD5 92812f06661bb78ab112d9f8ff6c7b73 files/pdftohtml-0.36-CAN-2005-3193.patch 2644
-MD5 5d40ba9d885af84bcc917ad17e2bf8e0 files/pdftohtml-xpdf-3.00pl2-CAN-2004-1125.patch 1136
-MD5 c32a612ce419b9930ff273cf382558bf files/xpdf-3.00pl3-keylength.patch 346
-MD5 87d20c86d1451638e4b7adc2f7ac8067 files/xpdf-CESA-2004-007-xpdf2-newer.diff 2718
-MD5 2fce5bedd61300fad1566a41f991a782 files/xpdf-goo-sizet.patch 1424
-MD5 362296e34a1a04a6e5e2a7d9e97547c6 files/xpdf2-underflow.patch 2363
-MD5 970c0d92252dd03d92e70f4d0185533f metadata.xml 224
-MD5 131d933badb6e33ddf427707ae06491d pdftohtml-0.36-r3.ebuild 1221
-MD5 3e05862170e407bed02e102c1d4508b7 pdftohtml-0.36-r4.ebuild 1289
diff --git a/app-text/pdftohtml/files/digest-pdftohtml-0.36-r3 b/app-text/pdftohtml/files/digest-pdftohtml-0.36-r3
deleted file mode 100644
index 5ae8348e609f..000000000000
--- a/app-text/pdftohtml/files/digest-pdftohtml-0.36-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 75ad095bb51e1f66c9f7691e6af12f44 pdftohtml-0.36.tar.gz 300922
diff --git a/app-text/pdftohtml/files/digest-pdftohtml-0.36-r4 b/app-text/pdftohtml/files/digest-pdftohtml-0.36-r4
deleted file mode 100644
index 5ae8348e609f..000000000000
--- a/app-text/pdftohtml/files/digest-pdftohtml-0.36-r4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 75ad095bb51e1f66c9f7691e6af12f44 pdftohtml-0.36.tar.gz 300922
diff --git a/app-text/pdftohtml/files/pdftohtml-0.36-CAN-2005-3193.patch b/app-text/pdftohtml/files/pdftohtml-0.36-CAN-2005-3193.patch
deleted file mode 100644
index ee0fa65e268b..000000000000
--- a/app-text/pdftohtml/files/pdftohtml-0.36-CAN-2005-3193.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-diff --exclude-from=/home/dang/.diffrc -u -ruN pdftohtml-0.36.orig/xpdf/Stream.cc pdftohtml-0.36/xpdf/Stream.cc
---- pdftohtml-0.36.orig/xpdf/Stream.cc	2003-06-24 18:41:27.000000000 -0400
-+++ pdftohtml-0.36/xpdf/Stream.cc	2005-12-06 15:43:00.000000000 -0500
-@@ -404,18 +404,33 @@
- 
- StreamPredictor::StreamPredictor(Stream *strA, int predictorA,
- 				 int widthA, int nCompsA, int nBitsA) {
-+  int totalBits;
-+
-   str = strA;
-   predictor = predictorA;
-   width = widthA;
-   nComps = nCompsA;
-   nBits = nBitsA;
-+  predLine = NULL;
-+  ok = gFalse;
- 
-   nVals = width * nComps;
-+  totalBits = nVals * nBits;
-+  if (totalBits == 0 ||
-+      (totalBits / nBits) / nComps != width ||
-+      totalBits + 7 < 0) {
-+    return;
-+  }
-   pixBytes = (nComps * nBits + 7) >> 3;
--  rowBytes = ((nVals * nBits + 7) >> 3) + pixBytes;
-+  rowBytes = ((totalBits + 7) >> 3) + pixBytes;
-+  if (rowBytes < 0) {
-+    return;
-+  }
-   predLine = (Guchar *)gmalloc(rowBytes);
-   memset(predLine, 0, rowBytes);
-   predIdx = rowBytes;
-+
-+  ok = gTrue;
- }
- 
- StreamPredictor::~StreamPredictor() {
-@@ -981,6 +996,10 @@
-     FilterStream(strA) {
-   if (predictor != 1) {
-     pred = new StreamPredictor(this, predictor, columns, colors, bits);
-+    if (!pred->isOk()) {
-+      delete pred;
-+      pred = NULL;
-+    }
-   } else {
-     pred = NULL;
-   }
-@@ -2864,6 +2883,14 @@
-   height = read16();
-   width = read16();
-   numComps = str->getChar();
-+  if (numComps <= 0 || numComps > 4) {
-+    error(getPos(), "Bad number of components in DCT stream", prec);
-+    return gFalse;
-+  }
-+  if (numComps <= 0 || numComps > 4) {
-+    error(getPos(), "Bad number of components in DCT stream", prec);
-+    return gFalse;
-+  }
-   if (prec != 8) {
-     error(getPos(), "Bad DCT precision %d", prec);
-     return gFalse;
-@@ -3182,6 +3209,10 @@
-     FilterStream(strA) {
-   if (predictor != 1) {
-     pred = new StreamPredictor(this, predictor, columns, colors, bits);
-+    if (!pred->isOk()) {
-+      delete pred;
-+      pred = NULL;
-+    }
-   } else {
-     pred = NULL;
-   }
-diff --exclude-from=/home/dang/.diffrc -u -ruN pdftohtml-0.36.orig/xpdf/Stream.h pdftohtml-0.36/xpdf/Stream.h
---- pdftohtml-0.36.orig/xpdf/Stream.h	2003-06-24 18:41:27.000000000 -0400
-+++ pdftohtml-0.36/xpdf/Stream.h	2005-12-06 15:43:00.000000000 -0500
-@@ -225,6 +225,8 @@
- 
-   ~StreamPredictor();
- 
-+  GBool isOk() { return ok; }
-+
-   int lookChar();
-   int getChar();
- 
-@@ -242,6 +244,7 @@
-   int rowBytes;			// bytes per line
-   Guchar *predLine;		// line buffer
-   int predIdx;			// current index in predLine
-+  GBool ok;
- };
- 
- //------------------------------------------------------------------------
diff --git a/app-text/pdftohtml/files/pdftohtml-xpdf-3.00pl2-CAN-2004-1125.patch b/app-text/pdftohtml/files/pdftohtml-xpdf-3.00pl2-CAN-2004-1125.patch
deleted file mode 100644
index 119de236d50b..000000000000
--- a/app-text/pdftohtml/files/pdftohtml-xpdf-3.00pl2-CAN-2004-1125.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-*** Gfx.cc.orig	Sun Dec 12 16:04:43 2004
---- Gfx.cc	Sun Dec 12 16:05:16 2004
-***************
-*** 2654,2660 ****
-      haveMask = gFalse;
-      dict->lookup("Mask", &maskObj);
-      if (maskObj.isArray()) {
-!       for (i = 0; i < maskObj.arrayGetLength(); ++i) {
-  	maskObj.arrayGet(i, &obj1);
-  	maskColors[i] = obj1.getInt();
-  	obj1.free();
---- 2654,2662 ----
-      haveMask = gFalse;
-      dict->lookup("Mask", &maskObj);
-      if (maskObj.isArray()) {
-!       for (i = 0;
-! 	   i < maskObj.arrayGetLength() && i < 2*gfxColorMaxComps;
-! 	   ++i) {
-  	maskObj.arrayGet(i, &obj1);
-  	maskColors[i] = obj1.getInt();
-  	obj1.free();
-*** GfxState.cc.orig	Sun Dec 12 16:04:48 2004
---- GfxState.cc	Sun Dec 12 16:06:38 2004
-***************
-*** 708,713 ****
---- 708,718 ----
-    }
-    nCompsA = obj2.getInt();
-    obj2.free();
-+   if (nCompsA > gfxColorMaxComps) {
-+     error(-1, "ICCBased color space with too many (%d > %d) components",
-+ 	  nCompsA, gfxColorMaxComps);
-+     nCompsA = gfxColorMaxComps;
-+   }
-    if (dict->lookup("Alternate", &obj2)->isNull() ||
-        !(altA = GfxColorSpace::parse(&obj2))) {
-      switch (nCompsA) {
diff --git a/app-text/pdftohtml/files/xpdf-3.00pl3-keylength.patch b/app-text/pdftohtml/files/xpdf-3.00pl3-keylength.patch
deleted file mode 100644
index d7d2294c8527..000000000000
--- a/app-text/pdftohtml/files/xpdf-3.00pl3-keylength.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-*** XRef.cc.orig	Wed Jan 12 17:10:53 2005
---- XRef.cc	Wed Jan 12 17:11:22 2005
-***************
-*** 793,798 ****
---- 793,801 ----
-  	} else {
-  	  keyLength = 5;
-  	}
-+ 	if (keyLength > 16) {
-+ 	  keyLength = 16;
-+ 	}
-  	permFlags = permissions.getInt();
-  	if (encVersion >= 1 && encVersion <= 2 &&
-  	    encRevision >= 2 && encRevision <= 3) {
diff --git a/app-text/pdftohtml/files/xpdf-CESA-2004-007-xpdf2-newer.diff b/app-text/pdftohtml/files/xpdf-CESA-2004-007-xpdf2-newer.diff
deleted file mode 100644
index 55a24458c9a4..000000000000
--- a/app-text/pdftohtml/files/xpdf-CESA-2004-007-xpdf2-newer.diff
+++ /dev/null
@@ -1,78 +0,0 @@
---- XRef.cc.orig	2004-09-17 23:54:38.000000000 -0700
-+++ XRef.cc	2004-09-25 17:59:36.000000000 -0700
-@@ -76,6 +76,12 @@
- 
-   // trailer is ok - read the xref table
-   } else {
-+    if (size*sizeof(XRefEntry)/sizeof(XRefEntry) != size) {
-+      error(-1, "Invalid 'size' inside xref table.");
-+      ok = gFalse;
-+      errCode = errDamaged;
-+      return;
-+    }
-     entries = (XRefEntry *)gmalloc(size * sizeof(XRefEntry));
-     for (i = 0; i < size; ++i) {
-       entries[i].offset = 0xffffffff;
-@@ -267,6 +273,10 @@
-     // table size
-     if (first + n > size) {
-       newSize = size + 256;
-+      if (newSize*sizeof(XRefEntry)/sizeof(XRefEntry) != newSize) {
-+        error(-1, "Invalid 'newSize'");
-+        goto err2;
-+      }
-       entries = (XRefEntry *)grealloc(entries, newSize * sizeof(XRefEntry));
-       for (i = size; i < newSize; ++i) {
- 	entries[i].offset = 0xffffffff;
-@@ -410,6 +420,10 @@
- 	    if (!strncmp(p, "obj", 3)) {
- 	      if (num >= size) {
- 		newSize = (num + 1 + 255) & ~255;
-+	        if (newSize*sizeof(XRefEntry)/sizeof(XRefEntry) != newSize) {
-+	          error(-1, "Invalid 'obj' parameters.");
-+	          return gFalse;
-+	        }
- 		entries = (XRefEntry *)
- 		            grealloc(entries, newSize * sizeof(XRefEntry));
- 		for (i = size; i < newSize; ++i) {
-@@ -431,6 +445,11 @@
-     } else if (!strncmp(p, "endstream", 9)) {
-       if (streamEndsLen == streamEndsSize) {
- 	streamEndsSize += 64;
-+        if (streamEndsSize*sizeof(int)/sizeof(int) != streamEndsSize) {
-+          error(-1, "Invalid 'endstream' parameter.");
-+          return gFalse;
-+        }
-+
- 	streamEnds = (Guint *)grealloc(streamEnds,
- 				       streamEndsSize * sizeof(int));
-       }
---- Catalog.cc.orig	2004-10-18 16:26:39.388666476 +0200
-+++ Catalog.cc	2004-10-18 16:27:28.004749073 +0200
-@@ -62,6 +62,12 @@
-   }
-   pagesSize = numPages0 = obj.getInt();
-   obj.free();
-+  if (pagesSize*sizeof(Page *)/sizeof(Page *) != pagesSize ||
-+      pagesSize*sizeof(Ref)/sizeof(Ref) != pagesSize) {
-+    error(-1, "Invalid 'pagesSize'");
-+    ok = gFalse;
-+    return;
-+  }
-   pages = (Page **)gmalloc(pagesSize * sizeof(Page *));
-   pageRefs = (Ref *)gmalloc(pagesSize * sizeof(Ref));
-   for (i = 0; i < pagesSize; ++i) {
-@@ -186,6 +192,11 @@
-       }
-       if (start >= pagesSize) {
- 	pagesSize += 32;
-+        if (pagesSize*sizeof(Page *)/sizeof(Page *) != pagesSize ||
-+            pagesSize*sizeof(Ref)/sizeof(Ref) != pagesSize) {
-+          error(-1, "Invalid 'pagesSize' parameter.");
-+          goto err3;
-+        }
- 	pages = (Page **)grealloc(pages, pagesSize * sizeof(Page *));
- 	pageRefs = (Ref *)grealloc(pageRefs, pagesSize * sizeof(Ref));
- 	for (j = pagesSize - 32; j < pagesSize; ++j) {
-
-
diff --git a/app-text/pdftohtml/files/xpdf-goo-sizet.patch b/app-text/pdftohtml/files/xpdf-goo-sizet.patch
deleted file mode 100644
index 5d90c5120bd4..000000000000
--- a/app-text/pdftohtml/files/xpdf-goo-sizet.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff -ru xpdf-2.02pl1/goo/gmem.c xpdf-2.02pl1/goo/gmem.c
---- xpdf-2.02pl1/goo/gmem.c	2003-06-16 22:01:26.000000000 +0200
-+++ xpdf-2.02pl1/goo/gmem.c	2004-10-29 15:13:34.866919791 +0200
-@@ -53,9 +53,9 @@
- 
- #endif /* DEBUG_MEM */
- 
--void *gmalloc(int size) {
-+void *gmalloc(size_t size) {
- #ifdef DEBUG_MEM
--  int size1;
-+  size_t size1;
-   char *mem;
-   GMemHdr *hdr;
-   void *data;
-@@ -94,11 +94,11 @@
- #endif
- }
- 
--void *grealloc(void *p, int size) {
-+void *grealloc(void *p, size_t size) {
- #ifdef DEBUG_MEM
-   GMemHdr *hdr;
-   void *q;
--  int oldSize;
-+  size_t oldSize;
- 
-   if (size == 0) {
-     if (p)
-@@ -137,7 +137,7 @@
- 
- void gfree(void *p) {
- #ifdef DEBUG_MEM
--  int size;
-+  size_t size;
-   GMemHdr *hdr;
-   GMemHdr *prevHdr, *q;
-   int lst;
-diff -ru xpdf-2.02pl1/goo/gmem.h xpdf-2.02pl1/goo/gmem.h
---- xpdf-2.02pl1/goo/gmem.h	2003-06-16 22:01:26.000000000 +0200
-+++ xpdf-2.02pl1/goo/gmem.h	2004-10-29 15:13:50.864027201 +0200
-@@ -19,13 +19,13 @@
-  * Same as malloc, but prints error message and exits if malloc()
-  * returns NULL.
-  */
--extern void *gmalloc(int size);
-+extern void *gmalloc(size_t size);
- 
- /*
-  * Same as realloc, but prints error message and exits if realloc()
-  * returns NULL.  If <p> is NULL, calls malloc instead of realloc().
-  */
--extern void *grealloc(void *p, int size);
-+extern void *grealloc(void *p, size_t size);
- 
- /*
-  * Same as free, but checks for and ignores NULL pointers.
diff --git a/app-text/pdftohtml/files/xpdf2-underflow.patch b/app-text/pdftohtml/files/xpdf2-underflow.patch
deleted file mode 100644
index 9371be84352e..000000000000
--- a/app-text/pdftohtml/files/xpdf2-underflow.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-diff -ru xpdf-2.02pl1/xpdf/XRef.cc xpdf-2.02pl1/xpdf/XRef.cc
---- xpdf-2.02pl1/xpdf/XRef.cc	2004-10-29 15:16:45.790089001 +0200
-+++ xpdf-2.02pl1/xpdf/XRef.cc	2004-10-29 15:11:54.132168025 +0200
-@@ -66,6 +66,8 @@
-   start = str->getStart();
-   pos = readTrailer();
- 
-+  entries = NULL;
-+
-   // if there was a problem with the trailer,
-   // try to reconstruct the xref table
-   if (pos == 0) {
-@@ -76,7 +78,7 @@
- 
-   // trailer is ok - read the xref table
-   } else {
--    if (size*sizeof(XRefEntry)/sizeof(XRefEntry) != size) {
-+    if ((size < 0) || (size*sizeof(XRefEntry)/sizeof(XRefEntry) != size)) {
-       error(-1, "Invalid 'size' inside xref table.");
-       ok = gFalse;
-       errCode = errDamaged;
-@@ -181,7 +183,7 @@
-     n = atoi(p);
-     while ('0' <= *p && *p <= '9') ++p;
-     while (isspace(*p)) ++p;
--    if (p == buf)
-+    if ((p == buf) || (n < 0)) /* must make progress */
-       return 0;
-     pos1 += (p - buf) + n * 20;
-   }
-@@ -255,6 +257,10 @@
-     }
-     s[i] = '\0';
-     first = atoi(s);
-+    if (first < 0) {
-+        error(-1, "Invalid 'first'");
-+        goto err2;
-+    }
-     while ((c = str->lookChar()) != EOF && isspace(c)) {
-       str->getChar();
-     }
-@@ -266,6 +272,10 @@
-     }
-     s[i] = '\0';
-     n = atoi(s);
-+    if (n<=0) {
-+        error(-1, "Invalid 'n'");
-+        goto err2;
-+    }
-     while ((c = str->lookChar()) != EOF && isspace(c)) {
-       str->getChar();
-     }
-@@ -273,7 +283,7 @@
-     // table size
-     if (first + n > size) {
-       newSize = size + 256;
--      if (newSize*sizeof(XRefEntry)/sizeof(XRefEntry) != newSize) {
-+      if ((newSize < 0) || (newSize*sizeof(XRefEntry)/sizeof(XRefEntry) != newSize)) {
-         error(-1, "Invalid 'newSize'");
-         goto err2;
-       }
-@@ -406,6 +416,10 @@
-     // look for object
-     } else if (isdigit(*p)) {
-       num = atoi(p);
-+      if (num < 0) {
-+	error(-1, "Invalid 'num' parameters.");
-+	return gFalse;
-+      }
-       do {
- 	++p;
-       } while (*p && isdigit(*p));
-@@ -425,7 +439,7 @@
- 	    if (!strncmp(p, "obj", 3)) {
- 	      if (num >= size) {
- 		newSize = (num + 1 + 255) & ~255;
--	        if (newSize*sizeof(XRefEntry)/sizeof(XRefEntry) != newSize) {
-+	        if ((newSize < 0) || (newSize*sizeof(XRefEntry)/sizeof(XRefEntry) != newSize)) {
- 	          error(-1, "Invalid 'obj' parameters.");
- 	          return gFalse;
- 	        }
diff --git a/app-text/pdftohtml/metadata.xml b/app-text/pdftohtml/metadata.xml
deleted file mode 100644
index c1640aab5ddd..000000000000
--- a/app-text/pdftohtml/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>printing</herd>
-<maintainer>
-  <email>robbat2@gentoo.org</email>
-</maintainer>
-</pkgmetadata>
diff --git a/app-text/pdftohtml/pdftohtml-0.36-r3.ebuild b/app-text/pdftohtml/pdftohtml-0.36-r3.ebuild
deleted file mode 100644
index 24d03c17b6df..000000000000
--- a/app-text/pdftohtml/pdftohtml-0.36-r3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/pdftohtml/pdftohtml-0.36-r3.ebuild,v 1.9 2006/01/08 22:01:29 nattfodd Exp $
-
-inherit eutils
-
-DESCRIPTION="pdftohtml is a utility which converts PDF files into HTML and XML formats"
-HOMEPAGE="http://pdftohtml.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ~ppc-macos ppc64 sparc x86"
-IUSE=""
-DEPEND="virtual/libc
-		sys-devel/gcc
-		!app-text/poppler"
-RDEPEND="virtual/libc"
-
-src_unpack() {
-	unpack ${A}
-	EPATCH_OPTS="-d ${S}/xpdf -p0" epatch ${FILESDIR}/xpdf-CESA-2004-007-xpdf2-newer.diff
-	EPATCH_OPTS="-d ${S} -p1" epatch ${FILESDIR}/xpdf-goo-sizet.patch
-	EPATCH_OPTS="-d ${S} -p1" epatch ${FILESDIR}/xpdf2-underflow.patch
-	EPATCH_OPTS="-d ${S}/xpdf -p0" epatch ${FILESDIR}/pdftohtml-xpdf-3.00pl2-CAN-2004-1125.patch
-	EPATCH_OPTS="-d ${S}/xpdf -p0" epatch ${FILESDIR}/xpdf-3.00pl3-keylength.patch
-
-	# fix location of xpdfrc
-	sed -i "s:/usr/local/etc/xpdfrc:/etc/xpdfrc:" aconf.h
-}
-
-src_compile() {
-	emake || die
-}
-
-src_install() {
-	dobin pdftohtml
-	dodoc AUTHORS BUGS CHANGES COPYING README pdf2xml.dtd
-}
diff --git a/app-text/pdftohtml/pdftohtml-0.36-r4.ebuild b/app-text/pdftohtml/pdftohtml-0.36-r4.ebuild
deleted file mode 100644
index 133b65784021..000000000000
--- a/app-text/pdftohtml/pdftohtml-0.36-r4.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/pdftohtml/pdftohtml-0.36-r4.ebuild,v 1.7 2006/01/08 22:01:29 nattfodd Exp $
-
-inherit eutils
-
-DESCRIPTION="pdftohtml is a utility which converts PDF files into HTML and XML formats"
-HOMEPAGE="http://pdftohtml.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ~ppc-macos ppc64 sparc x86"
-IUSE=""
-DEPEND="virtual/libc
-		sys-devel/gcc
-		!app-text/poppler"
-RDEPEND="virtual/libc"
-
-src_unpack() {
-	unpack ${A}
-	EPATCH_OPTS="-d ${S}/xpdf -p0" epatch ${FILESDIR}/xpdf-CESA-2004-007-xpdf2-newer.diff
-	EPATCH_OPTS="-d ${S} -p1" epatch ${FILESDIR}/xpdf-goo-sizet.patch
-	EPATCH_OPTS="-d ${S} -p1" epatch ${FILESDIR}/xpdf2-underflow.patch
-	EPATCH_OPTS="-d ${S}/xpdf -p0" epatch ${FILESDIR}/pdftohtml-xpdf-3.00pl2-CAN-2004-1125.patch
-	EPATCH_OPTS="-d ${S}/xpdf -p0" epatch ${FILESDIR}/xpdf-3.00pl3-keylength.patch
-	# Fix for bug #114428
-	epatch ${FILESDIR}/${P}-CAN-2005-3193.patch
-
-	# fix location of xpdfrc
-	sed -i "s:/usr/local/etc/xpdfrc:/etc/xpdfrc:" aconf.h
-}
-
-src_compile() {
-	emake || die
-}
-
-src_install() {
-	dobin pdftohtml
-	dodoc AUTHORS BUGS CHANGES COPYING README pdf2xml.dtd
-}