Cleanup of old KDE 3.5.0 and 3.5.1 ebuild.s

(Portage version: 2.1_pre7-r4)

18 files changed, 11 insertions, 640 deletions

diff --git a/kde-base/kpdf/ChangeLog b/kde-base/kpdf/ChangeLog
index f4f28e7fcd72..e8b39d1c6643 100644
--- a/kde-base/kpdf/ChangeLog
+++ b/kde-base/kpdf/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for kde-base/kpdf
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kpdf/ChangeLog,v 1.91 2006/04/04 12:20:05 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpdf/ChangeLog,v 1.92 2006/04/06 02:35:21 flameeyes Exp $
+
+  06 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
+  -files/kpdf-3.5.0-cropbox-fix.patch,
+  -files/post-3.5.0-kdegraphics-CAN-2005-3193.diff,
+  -files/kpdf-3.5.0-splitter-io.patch,
+  -files/post-3.5.1-kdegraphics-CVE-2006-0301.diff,
+  -files/kpdf-3.5.1-saveas.patch, -kpdf-3.5.0.ebuild, -kpdf-3.5.0-r2.ebuild,
+  -kpdf-3.5.0-r3.ebuild, -kpdf-3.5.1.ebuild, -kpdf-3.5.1-r1.ebuild,
+  -kpdf-3.5.1-r2.ebuild:
+  Removed old 3.5.0/3.5.1 packages.
 
   04 Apr 2006; Stefan Schweizer <genstef@gentoo.org> kpdf-3.4.3-r3.ebuild,
   kpdf-3.4.3-r4.ebuild:
diff --git a/kde-base/kpdf/files/digest-kpdf-3.5.0 b/kde-base/kpdf/files/digest-kpdf-3.5.0
deleted file mode 100644
index 44e671a5ef99..000000000000
--- a/kde-base/kpdf/files/digest-kpdf-3.5.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 389a00d4387e621d4dd325a59c7657c4 kdegraphics-3.5.0.tar.bz2 7094349
diff --git a/kde-base/kpdf/files/digest-kpdf-3.5.0-r2 b/kde-base/kpdf/files/digest-kpdf-3.5.0-r2
deleted file mode 100644
index 44e671a5ef99..000000000000
--- a/kde-base/kpdf/files/digest-kpdf-3.5.0-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 389a00d4387e621d4dd325a59c7657c4 kdegraphics-3.5.0.tar.bz2 7094349
diff --git a/kde-base/kpdf/files/digest-kpdf-3.5.0-r3 b/kde-base/kpdf/files/digest-kpdf-3.5.0-r3
deleted file mode 100644
index 44e671a5ef99..000000000000
--- a/kde-base/kpdf/files/digest-kpdf-3.5.0-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 389a00d4387e621d4dd325a59c7657c4 kdegraphics-3.5.0.tar.bz2 7094349
diff --git a/kde-base/kpdf/files/digest-kpdf-3.5.1 b/kde-base/kpdf/files/digest-kpdf-3.5.1
deleted file mode 100644
index 9166f01a0810..000000000000
--- a/kde-base/kpdf/files/digest-kpdf-3.5.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2cd1c5348b7df46cf7f9d91e1dbfebd2 kdegraphics-3.5.1.tar.bz2 7315482
diff --git a/kde-base/kpdf/files/digest-kpdf-3.5.1-r1 b/kde-base/kpdf/files/digest-kpdf-3.5.1-r1
deleted file mode 100644
index 9166f01a0810..000000000000
--- a/kde-base/kpdf/files/digest-kpdf-3.5.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2cd1c5348b7df46cf7f9d91e1dbfebd2 kdegraphics-3.5.1.tar.bz2 7315482
diff --git a/kde-base/kpdf/files/digest-kpdf-3.5.1-r2 b/kde-base/kpdf/files/digest-kpdf-3.5.1-r2
deleted file mode 100644
index e6a9b99356b1..000000000000
--- a/kde-base/kpdf/files/digest-kpdf-3.5.1-r2
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 2cd1c5348b7df46cf7f9d91e1dbfebd2 kdegraphics-3.5.1.tar.bz2 7315482
-RMD160 a8b2b94c0378c689c9be808a1f57e93ecef54418 kdegraphics-3.5.1.tar.bz2 7315482
-SHA256 d0f1fed464c1d410b66c115a60245e1c639de828eebde181f26cc8185a0c9ad6 kdegraphics-3.5.1.tar.bz2 7315482
-MD5 f7ca204c5796c0633a1e51410c1b47b1 kpdf-3.5.1-poppler-0.5.1-bis.patch.bz2 2076
-RMD160 87eadc4d7f032580ccb5c3c12423d9aeb02fc640 kpdf-3.5.1-poppler-0.5.1-bis.patch.bz2 2076
-SHA256 f623a43e67f731067dbe8688963b72565a5f63c5af7ab0cf2fccf3cbc0873adc kpdf-3.5.1-poppler-0.5.1-bis.patch.bz2 2076
-MD5 357d6f2afde33c2dcb3e07d7ce74b216 kpdf-3.5.1-poppler-2.patch.bz2 5847
-RMD160 2351c506ccd34dade7cd7fdfdabaa4561fa7226e kpdf-3.5.1-poppler-2.patch.bz2 5847
-SHA256 3daf7caec19b6060eeb454dd668986fda28f1ad2faea9d91cdc89bf8e4e3a58e kpdf-3.5.1-poppler-2.patch.bz2 5847
diff --git a/kde-base/kpdf/files/kpdf-3.5.0-cropbox-fix.patch b/kde-base/kpdf/files/kpdf-3.5.0-cropbox-fix.patch
deleted file mode 100644
index 17fbeeaee27c..000000000000
--- a/kde-base/kpdf/files/kpdf-3.5.0-cropbox-fix.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- branches/KDE/3.5/kdegraphics/kpdf/xpdf/xpdf/Page.cc	2005/09/09 18:24:18	459064
-+++ branches/KDE/3.5/kdegraphics/kpdf/xpdf/xpdf/Page.cc	2005/12/18 21:44:35	489480
-@@ -66,6 +66,20 @@
-   if (!haveCropBox) {
-     cropBox = mediaBox;
-   }
-+  else
-+  {
-+    // cropBox can not be bigger than mediaBox
-+    if (cropBox.x2 - cropBox.x1 > mediaBox.x2 - mediaBox.x1)
-+    {
-+      cropBox.x1 = mediaBox.x1;
-+      cropBox.x2 = mediaBox.x2;
-+    }
-+    if (cropBox.y2 - cropBox.y1 > mediaBox.y2 - mediaBox.y1)
-+    {
-+      cropBox.y1 = mediaBox.y1;
-+      cropBox.y2 = mediaBox.y2;
-+    }
-+  }
- 
-   // other boxes
-   bleedBox = cropBox;
diff --git a/kde-base/kpdf/files/kpdf-3.5.0-splitter-io.patch b/kde-base/kpdf/files/kpdf-3.5.0-splitter-io.patch
deleted file mode 100644
index 82e4311bba5c..000000000000
--- a/kde-base/kpdf/files/kpdf-3.5.0-splitter-io.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Index: kpdf/part.cpp
-===================================================================
---- kpdf/part.cpp	(revision 485446)
-+++ kpdf/part.cpp	(revision 485447)
-@@ -274,6 +274,8 @@
- 	connect( m_watcher, SIGNAL( dirty( const QString& ) ), this, SLOT( slotFileDirty( const QString& ) ) );
- 	m_dirtyHandler = new QTimer( this );
- 	connect( m_dirtyHandler, SIGNAL( timeout() ),this, SLOT( slotDoFileDirty() ) );
-+	m_saveSplitterSizeTimer = new QTimer( this );
-+	connect( m_saveSplitterSizeTimer, SIGNAL( timeout() ),this, SLOT( saveSplitterSize() ) );
- 
- 	slotNewConfig();
- 
-@@ -478,7 +480,7 @@
- {
-     // if pageView has been resized, save splitter sizes
-     if ( watched == m_pageView && e->type() == QEvent::Resize )
--        saveSplitterSize();
-+        m_saveSplitterSizeTimer->start(500, true);
- 
-     // only intercept events, don't block them
-     return false;
-Index: kpdf/part.h
-===================================================================
---- kpdf/part.h	(revision 485446)
-+++ kpdf/part.h	(revision 485447)
-@@ -146,6 +146,11 @@
- 	// static instances counter
- 	static unsigned int m_count;
- 
-+	// this is a hack because we can not use writeConfig on part destructor
-+	// and we don't want to writeconfig every time someone moves the splitter
-+	// so we use a QTimer each 500 ms
-+	QTimer *m_saveSplitterSizeTimer;
-+
- 	KDirWatch *m_watcher;
- 	QTimer *m_dirtyHandler;
- 	DocumentViewport m_viewportDirty;
diff --git a/kde-base/kpdf/files/kpdf-3.5.1-saveas.patch b/kde-base/kpdf/files/kpdf-3.5.1-saveas.patch
deleted file mode 100644
index 7649d393453e..000000000000
--- a/kde-base/kpdf/files/kpdf-3.5.1-saveas.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- branches/KDE/3.5/kdegraphics/kpdf/part.cpp	2006/01/18 21:57:05	499855
-+++ branches/KDE/3.5/kdegraphics/kpdf/part.cpp	2006/01/23 23:11:54	501814
-@@ -697,6 +697,11 @@
-     KURL saveURL = KFileDialog::getSaveURL( url().isLocalFile() ? url().url() : url().fileName(), QString::null, widget() );
-     if ( saveURL.isValid() && !saveURL.isEmpty() )
-     {
-+        if (saveURL == url())
-+        {
-+            KMessageBox::information( widget(), i18n("You are trying to overwrite \"%1\" with itself. This is not allowed. Please save it in another location.").arg(saveURL.filename()) );
-+            return;
-+        }
-         if ( KIO::NetAccess::exists( saveURL, false, widget() ) )
-         {
-             if (KMessageBox::warningContinueCancel( widget(), i18n("A file named \"%1\" already exists. Are you sure you want to overwrite it?").arg(saveURL.filename()), QString::null, i18n("Overwrite")) != KMessageBox::Continue)
diff --git a/kde-base/kpdf/files/post-3.5.0-kdegraphics-CAN-2005-3193.diff b/kde-base/kpdf/files/post-3.5.0-kdegraphics-CAN-2005-3193.diff
deleted file mode 100644
index 0b6f22303de8..000000000000
--- a/kde-base/kpdf/files/post-3.5.0-kdegraphics-CAN-2005-3193.diff
+++ /dev/null
@@ -1,287 +0,0 @@
-Index: kpdf/xpdf/xpdf/JBIG2Stream.cc
-===================================================================
---- kpdf/xpdf/xpdf/JBIG2Stream.cc	(revision 481099)
-+++ kpdf/xpdf/xpdf/JBIG2Stream.cc	(revision 488715)
-@@ -7,6 +7,7 @@
- //========================================================================
- 
- #include <aconf.h>
-+#include <limits.h>
- 
- #ifdef USE_GCC_PRAGMAS
- #pragma implementation
-@@ -681,6 +682,12 @@ JBIG2Bitmap::JBIG2Bitmap(Guint segNumA, 
-   w = wA;
-   h = hA;
-   line = (wA + 7) >> 3;
-+
-+  if (h < 0 || line <= 0 || h >= (INT_MAX - 1) / line ) {
-+    data = NULL;
-+    return;
-+  }
-+  
-   // need to allocate one extra guard byte for use in combine()
-   data = (Guchar *)gmalloc(h * line + 1);
-   data[h * line] = 0;
-@@ -692,6 +699,12 @@ JBIG2Bitmap::JBIG2Bitmap(Guint segNumA, 
-   w = bitmap->w;
-   h = bitmap->h;
-   line = bitmap->line;
-+
-+  if (h < 0 || line <= 0 || h >= (INT_MAX - 1) / line) {
-+    data = NULL;
-+    return;
-+  }
-+ 
-   // need to allocate one extra guard byte for use in combine()
-   data = (Guchar *)gmalloc(h * line + 1);
-   memcpy(data, bitmap->data, h * line);
-@@ -720,7 +733,8 @@ JBIG2Bitmap *JBIG2Bitmap::getSlice(Guint
- }
- 
- void JBIG2Bitmap::expand(int newH, Guint pixel) {
--  if (newH <= h) {
-+
-+  if (newH <= h || line <= 0 || newH >= (INT_MAX - 1) / line) {
-     return;
-   }
-   // need to allocate one extra guard byte for use in combine()
-@@ -2305,6 +2319,15 @@ void JBIG2Stream::readHalftoneRegionSeg(
-     error(getPos(), "Bad symbol dictionary reference in JBIG2 halftone segment");
-     return;
-   }
-+  if (gridH == 0 || gridW >= INT_MAX / gridH) {
-+    error(getPos(), "Bad size in JBIG2 halftone segment");
-+    return;
-+  }
-+  if (h < 0 || w == 0 || h >= INT_MAX / w) {
-+     error(getPos(), "Bad size in JBIG2 bitmap segment");
-+    return;
-+  }
-+
-   patternDict = (JBIG2PatternDict *)seg;
-   bpp = 0;
-   i = 1;
-@@ -2936,6 +2959,9 @@ JBIG2Bitmap *JBIG2Stream::readGenericRef
-   JBIG2BitmapPtr tpgrCXPtr0, tpgrCXPtr1, tpgrCXPtr2;
-   int x, y, pix;
- 
-+  if (w < 0 || h <= 0 || w >= INT_MAX / h)
-+    return NULL;
-+
-   bitmap = new JBIG2Bitmap(0, w, h);
-   bitmap->clearToZero();
- 
-Index: kpdf/xpdf/xpdf/Stream.cc
-===================================================================
---- kpdf/xpdf/xpdf/Stream.cc	(revision 481099)
-+++ kpdf/xpdf/xpdf/Stream.cc	(revision 488715)
-@@ -15,6 +15,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <stddef.h>
-+#include <limits.h>
- #ifndef WIN32
- #include <unistd.h>
- #endif
-@@ -408,13 +409,27 @@ StreamPredictor::StreamPredictor(Stream 
-   width = widthA;
-   nComps = nCompsA;
-   nBits = nBitsA;
-+  predLine = NULL;
-+  ok = gFalse;
-+
-+  if (width <= 0 || nComps <= 0 || nBits <= 0 ||
-+      nComps >= INT_MAX / nBits ||
-+      width >= INT_MAX / nComps / nBits)
-+    return;
- 
-   nVals = width * nComps;
-+  if (nVals * nBits + 7 <= 0)
-+    return;
-   pixBytes = (nComps * nBits + 7) >> 3;
-   rowBytes = ((nVals * nBits + 7) >> 3) + pixBytes;
-+  if (rowBytes < 0)
-+    return;
-+
-   predLine = (Guchar *)gmalloc(rowBytes);
-   memset(predLine, 0, rowBytes);
-   predIdx = rowBytes;
-+
-+  ok = gTrue;
- }
- 
- StreamPredictor::~StreamPredictor() {
-@@ -1006,6 +1021,10 @@ LZWStream::LZWStream(Stream *strA, int p
-     FilterStream(strA) {
-   if (predictor != 1) {
-     pred = new StreamPredictor(this, predictor, columns, colors, bits);
-+    if (!pred->isOk()) {
-+      delete pred;
-+      pred = NULL;
-+    }
-   } else {
-     pred = NULL;
-   }
-@@ -1258,8 +1277,9 @@ CCITTFaxStream::CCITTFaxStream(Stream *s
-   endOfLine = endOfLineA;
-   byteAlign = byteAlignA;
-   columns = columnsA;
--  if (columns < 1) {
--    columns = 1;
-+  if (columns < 1 || columns >= INT_MAX / sizeof(short)) {
-+     error(getPos(), "Bad number of columns in CCITTFaxStream");
-+     exit(1);
-   }
-   rows = rowsA;
-   endOfBlock = endOfBlockA;
-@@ -2903,7 +2923,12 @@ GBool DCTStream::readBaselineSOF() {
-   height = read16();
-   width = read16();
-   numComps = str->getChar();
--  if (prec != 8) {
-+  if (numComps <= 0 || numComps > 4) {
-+    numComps = 0;
-+    error(getPos(), "Bad number of components in DCT stream", prec);
-+    return gFalse;
-+  }
-+ if (prec != 8) {
-     error(getPos(), "Bad DCT precision %d", prec);
-     return gFalse;
-   }
-@@ -2929,6 +2954,11 @@ GBool DCTStream::readProgressiveSOF() {
-   height = read16();
-   width = read16();
-   numComps = str->getChar();
-+  if (numComps <= 0 || numComps > 4) {
-+    numComps = 0;
-+    error(getPos(), "Bad number of components in DCT stream");
-+    return gFalse;
-+  }
-   if (prec != 8) {
-     error(getPos(), "Bad DCT precision %d", prec);
-     return gFalse;
-@@ -2951,6 +2981,11 @@ GBool DCTStream::readScanInfo() {
- 
-   length = read16() - 2;
-   scanInfo.numComps = str->getChar();
-+  if (scanInfo.numComps <= 0 || scanInfo.numComps > 4) {
-+    scanInfo.numComps = 0;
-+    error(getPos(), "Bad number of components in DCT stream");
-+    return gFalse;
-+  }
-   --length;
-   if (length != 2 * scanInfo.numComps + 3) {
-     error(getPos(), "Bad DCT scan info block");
-@@ -3035,12 +3070,12 @@ GBool DCTStream::readHuffmanTables() {
-   while (length > 0) {
-     index = str->getChar();
-     --length;
--    if ((index & 0x0f) >= 4) {
-+    if ((index & ~0x10) >= 4 || (index & ~0x10) < 0) {
-       error(getPos(), "Bad DCT Huffman table");
-       return gFalse;
-     }
-     if (index & 0x10) {
--      index &= 0x0f;
-+      index &= 0x03;
-       if (index >= numACHuffTables)
- 	numACHuffTables = index+1;
-       tbl = &acHuffTables[index];
-@@ -3833,6 +3868,10 @@ FlateStream::FlateStream(Stream *strA, i
-     FilterStream(strA) {
-   if (predictor != 1) {
-     pred = new StreamPredictor(this, predictor, columns, colors, bits);
-+    if (!pred->isOk()) {
-+      delete pred;
-+      pred = NULL;
-+    }
-   } else {
-     pred = NULL;
-   }
-Index: kpdf/xpdf/xpdf/Stream.h
-===================================================================
---- kpdf/xpdf/xpdf/Stream.h	(revision 481099)
-+++ kpdf/xpdf/xpdf/Stream.h	(revision 488715)
-@@ -232,6 +232,8 @@ public:
- 
-   ~StreamPredictor();
- 
-+  GBool isOk() { return ok; }
-+
-   int lookChar();
-   int getChar();
- 
-@@ -249,6 +251,7 @@ private:
-   int rowBytes;			// bytes per line
-   Guchar *predLine;		// line buffer
-   int predIdx;			// current index in predLine
-+  GBool ok;
- };
- 
- //------------------------------------------------------------------------
---- kpdf/xpdf/xpdf/JPXStream.cc	(revision 481099)
-+++ kpdf/xpdf/xpdf/JPXStream.cc	(revision 488715)
-@@ -7,6 +7,7 @@
- //========================================================================
- 
- #include <aconf.h>
-+#include <limits.h>
- 
- #ifdef USE_GCC_PRAGMAS
- #pragma implementation
-@@ -783,7 +784,7 @@ GBool JPXStream::readCodestream(Guint /*
-   int segType;
-   GBool haveSIZ, haveCOD, haveQCD, haveSOT;
-   Guint precinctSize, style;
--  Guint segLen, capabilities, comp, i, j, r;
-+  Guint segLen, capabilities, nTiles, comp, i, j, r;
- 
-   //----- main header
-   haveSIZ = haveCOD = haveQCD = haveSOT = gFalse;
-@@ -818,8 +819,13 @@ GBool JPXStream::readCodestream(Guint /*
- 	            / img.xTileSize;
-       img.nYTiles = (img.ySize - img.yTileOffset + img.yTileSize - 1)
- 	            / img.yTileSize;
--      img.tiles = (JPXTile *)gmallocn(img.nXTiles * img.nYTiles,
--				     sizeof(JPXTile));
-+      nTiles = img.nXTiles * img.nYTiles;
-+      // check for overflow before allocating memory
-+      if (img.nXTiles <= 0 || img.nYTiles <= 0 || img.nXTiles >= INT_MAX / img.nYTiles) {
-+	error(getPos(), "Bad tile count in JPX SIZ marker segment");
-+	return gFalse;
-+      }
-+      img.tiles = (JPXTile *)gmallocn(nTiles, sizeof(JPXTile));
-       for (i = 0; i < img.nXTiles * img.nYTiles; ++i) {
- 	img.tiles[i].tileComps = (JPXTileComp *)gmallocn(img.nComps,
- 							sizeof(JPXTileComp));
-Index: kpdf/xpdf/goo/gmem.c
-===================================================================
---- kpdf/xpdf/goo/gmem.c	(revision 481099)
-+++ kpdf/xpdf/goo/gmem.c	(revision 488715)
-@@ -11,6 +11,7 @@
- #include <stdlib.h>
- #include <stddef.h>
- #include <string.h>
-+#include <limits.h>
- #include "gmem.h"
- 
- #ifdef DEBUG_MEM
-@@ -141,7 +142,7 @@ void *gmallocn(int nObjs, int objSize) {
-   int n;
- 
-   n = nObjs * objSize;
--  if (objSize == 0 || n / objSize != nObjs) {
-+  if (objSize <= 0 || nObjs < 0 || nObjs >= INT_MAX / objSize) {
-     fprintf(stderr, "Bogus memory allocation size\n");
-     exit(1);
-   }
-@@ -152,7 +153,7 @@ void *greallocn(void *p, int nObjs, int 
-   int n;
- 
-   n = nObjs * objSize;
--  if (objSize == 0 || n / objSize != nObjs) {
-+  if (objSize <= 0 || nObjs < 0 || nObjs >= INT_MAX / objSize) {
-     fprintf(stderr, "Bogus memory allocation size\n");
-     exit(1);
-   }
diff --git a/kde-base/kpdf/files/post-3.5.1-kdegraphics-CVE-2006-0301.diff b/kde-base/kpdf/files/post-3.5.1-kdegraphics-CVE-2006-0301.diff
deleted file mode 100644
index e2e19b511dd7..000000000000
--- a/kde-base/kpdf/files/post-3.5.1-kdegraphics-CVE-2006-0301.diff
+++ /dev/null
@@ -1,50 +0,0 @@
---- kpdf/xpdf/splash/SplashXPathScanner.cc	(Revision 505052)
-+++ kpdf/xpdf/splash/SplashXPathScanner.cc	(Arbeitskopie)
-@@ -186,7 +186,7 @@ GBool SplashXPathScanner::getNextSpan(in
- }
- 
- void SplashXPathScanner::computeIntersections(int y) {
--  SplashCoord ySegMin, ySegMax, xx0, xx1;
-+  SplashCoord xSegMin, xSegMax, ySegMin, ySegMax, xx0, xx1;
-   SplashXPathSeg *seg;
-   int i, j;
- 
-@@ -236,19 +236,27 @@ void SplashXPathScanner::computeIntersec
-     } else if (seg->flags & splashXPathVert) {
-       xx0 = xx1 = seg->x0;
-     } else {
--      if (ySegMin <= y) {
--	// intersection with top edge
--	xx0 = seg->x0 + ((SplashCoord)y - seg->y0) * seg->dxdy;
-+      if (seg->x0 < seg->x1) {
-+	xSegMin = seg->x0;
-+	xSegMax = seg->x1;
-       } else {
--	// x coord of segment endpoint with min y coord
--	xx0 = (seg->flags & splashXPathFlip) ? seg->x1 : seg->x0;
-+	xSegMin = seg->x1;
-+	xSegMax = seg->x0;
-       }
--      if (ySegMax >= y + 1) {
--	// intersection with bottom edge
--	xx1 = seg->x0 + ((SplashCoord)y + 1 - seg->y0) * seg->dxdy;
--      } else {
--	// x coord of segment endpoint with max y coord
--	xx1 = (seg->flags & splashXPathFlip) ? seg->x0 : seg->x1;
-+      // intersection with top edge
-+      xx0 = seg->x0 + ((SplashCoord)y - seg->y0) * seg->dxdy;
-+      // intersection with bottom edge
-+      xx1 = seg->x0 + ((SplashCoord)y + 1 - seg->y0) * seg->dxdy;
-+      // the segment may not actually extend to the top and/or bottom edges
-+      if (xx0 < xSegMin) {
-+	xx0 = xSegMin;
-+      } else if (xx0 > xSegMax) {
-+	xx0 = xSegMax;
-+      }
-+      if (xx1 < xSegMin) {
-+	xx1 = xSegMin;
-+      } else if (xx1 > xSegMax) {
-+	xx1 = xSegMax;
-       }
-     }
-     if (xx0 < xx1) {
diff --git a/kde-base/kpdf/kpdf-3.5.0-r2.ebuild b/kde-base/kpdf/kpdf-3.5.0-r2.ebuild
deleted file mode 100644
index 3a59f69c9834..000000000000
--- a/kde-base/kpdf/kpdf-3.5.0-r2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kpdf/kpdf-3.5.0-r2.ebuild,v 1.3 2006/03/24 12:31:25 agriffis Exp $
-
-KMNAME=kdegraphics
-MAXKDEVER=$PV
-KM_DEPRANGE="$PV $MAXKDEVER"
-inherit kde-meta
-
-DESCRIPTION="kpdf, a kde pdf viewer based on xpdf"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc64 ~sparc ~x86"
-IUSE=""
-KMEXTRA="kfile-plugins/pdf"
-
-DEPEND=">=media-libs/freetype-2.0.5
-	media-libs/t1lib
-	>=app-text/poppler-0.3.1"
-
-PATCHES="${FILESDIR}/post-3.5.0-kdegraphics-CAN-2005-3193.diff ${FILESDIR}/kpdf-3.5.0-splitter-io.patch"
-
-pkg_setup() {
-	if ! built_with_use app-text/poppler qt; then
-		eerror "This package requires app-text/poppler compiled with Qt support."
-		eerror "Please reemerge app-text/poppler with USE=\"qt\"."
-		die "Please reemerge app-text/poppler with USE=\"qt\"."
-	fi
-}
-
-src_compile() {
-	local myconf="--with-poppler"
-
-	kde-meta_src_compile
-}
diff --git a/kde-base/kpdf/kpdf-3.5.0-r3.ebuild b/kde-base/kpdf/kpdf-3.5.0-r3.ebuild
deleted file mode 100644
index 771652f43aa0..000000000000
--- a/kde-base/kpdf/kpdf-3.5.0-r3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kpdf/kpdf-3.5.0-r3.ebuild,v 1.5 2006/03/24 12:31:25 agriffis Exp $
-
-KMNAME=kdegraphics
-MAXKDEVER=$PV
-KM_DEPRANGE="$PV $MAXKDEVER"
-inherit kde-meta flag-o-matic
-
-DESCRIPTION="kpdf, a kde pdf viewer based on xpdf"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-KMEXTRA="kfile-plugins/pdf"
-
-DEPEND=">=media-libs/freetype-2.0.5
-	media-libs/t1lib
-	>=app-text/poppler-bindings-0.3.1"
-
-PATCHES="${FILESDIR}/post-3.5.0-kdegraphics-CAN-2005-3193.diff
-	${FILESDIR}/kpdf-3.5.0-splitter-io.patch
-	${FILESDIR}/kpdf-3.5.0-cropbox-fix.patch"
-
-pkg_setup() {
-	if ! built_with_use app-text/poppler-bindings qt; then
-		eerror "This package requires app-text/poppler-bindings compiled with Qt support."
-		eerror "Please reemerge app-text/poppler-bindings with USE=\"qt\"."
-		die "Please reemerge app-text/poppler-bindings with USE=\"qt\"."
-	fi
-}
-
-src_compile() {
-	local myconf="--with-poppler"
-	replace-flags "-Os" "-O2" # see bug 114822
-	kde-meta_src_compile
-}
diff --git a/kde-base/kpdf/kpdf-3.5.0.ebuild b/kde-base/kpdf/kpdf-3.5.0.ebuild
deleted file mode 100644
index 9ba243b2802f..000000000000
--- a/kde-base/kpdf/kpdf-3.5.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kpdf/kpdf-3.5.0.ebuild,v 1.6 2006/03/24 12:31:25 agriffis Exp $
-
-KMNAME=kdegraphics
-MAXKDEVER=$PV
-KM_DEPRANGE="$PV $MAXKDEVER"
-inherit kde-meta
-
-DESCRIPTION="kpdf, a kde pdf viewer based on xpdf"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
-IUSE=""
-KMEXTRA="kfile-plugins/pdf"
-
-DEPEND=">=media-libs/freetype-2.0.5
-	media-libs/t1lib
-	>=app-text/poppler-0.3.1"
-
-pkg_setup() {
-	if ! built_with_use app-text/poppler qt; then
-		eerror "This package requires app-text/poppler compiled with Qt support."
-		eerror "Please reemerge app-text/poppler with USE=\"qt\"."
-		die "Please reemerge app-text/poppler with USE=\"qt\"."
-	fi
-}
-
-src_compile() {
-	local myconf="--with-poppler"
-
-	kde-meta_src_compile
-}
diff --git a/kde-base/kpdf/kpdf-3.5.1-r1.ebuild b/kde-base/kpdf/kpdf-3.5.1-r1.ebuild
deleted file mode 100644
index c1636267bdca..000000000000
--- a/kde-base/kpdf/kpdf-3.5.1-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kpdf/kpdf-3.5.1-r1.ebuild,v 1.2 2006/03/24 12:31:25 agriffis Exp $
-
-KMNAME=kdegraphics
-MAXKDEVER=$PV
-KM_DEPRANGE="$PV $MAXKDEVER"
-inherit kde-meta flag-o-matic
-
-DESCRIPTION="kpdf, a kde pdf viewer based on xpdf"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-KMEXTRA="kfile-plugins/pdf"
-
-DEPEND=">=media-libs/freetype-2.0.5
-	media-libs/t1lib
-	>=app-text/poppler-bindings-0.3.1"
-
-PATCHES="${FILESDIR}/${P}-saveas.patch
-	${FILESDIR}/post-3.5.1-kdegraphics-CVE-2006-0301.diff"
-
-pkg_setup() {
-	if ! built_with_use app-text/poppler-bindings qt; then
-		eerror "This package requires app-text/poppler-bindings compiled with Qt support."
-		eerror "Please reemerge app-text/poppler-bindings with USE=\"qt\"."
-		die "Please reemerge app-text/poppler-bindings with USE=\"qt\"."
-	fi
-}
-
-src_compile() {
-	local myconf="--with-poppler"
-	replace-flags "-Os" "-O2" # see bug 114822
-	kde-meta_src_compile
-}
diff --git a/kde-base/kpdf/kpdf-3.5.1-r2.ebuild b/kde-base/kpdf/kpdf-3.5.1-r2.ebuild
deleted file mode 100644
index f320ee910950..000000000000
--- a/kde-base/kpdf/kpdf-3.5.1-r2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kpdf/kpdf-3.5.1-r2.ebuild,v 1.7 2006/03/24 12:31:25 agriffis Exp $
-
-KMNAME=kdegraphics
-MAXKDEVER=$PV
-KM_DEPRANGE="$PV $MAXKDEVER"
-inherit kde-meta flag-o-matic
-
-DESCRIPTION="kpdf, a kde pdf viewer based on xpdf"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-KMEXTRA="kfile-plugins/pdf"
-
-DEPEND=">=media-libs/freetype-2.0.5
-	media-libs/t1lib
-	>=app-text/poppler-0.5.0-r1
-	>=app-text/poppler-bindings-0.5.0"
-
-SRC_URI="${SRC_URI}
-	mirror://gentoo/${P}-poppler-2.patch.bz2
-	mirror://gentoo/kpdf-${PV}-poppler-0.5.1-bis.patch.bz2"
-
-PATCHES="${FILESDIR}/${P}-saveas.patch
-	${DISTDIR}/${P}-poppler-2.patch.bz2"
-
-pkg_setup() {
-	if ! built_with_use app-text/poppler-bindings qt; then
-		eerror "This package requires app-text/poppler-bindings compiled with Qt support."
-		eerror "Please reemerge app-text/poppler-bindings with USE=\"qt\"."
-		die "Please reemerge app-text/poppler-bindings with USE=\"qt\"."
-	fi
-}
-
-src_unpack() {
-	kde-meta_src_unpack
-
-	# Lovely when libraries changes API in micro releases.
-	has_version ">=app-text/poppler-0.5.1" && \
-		epatch "${DISTDIR}/kpdf-${PV}-poppler-0.5.1-bis.patch.bz2"
-}
-
-src_compile() {
-	local myconf="--with-poppler"
-	replace-flags "-Os" "-O2" # see bug 114822
-	kde-meta_src_compile
-}
diff --git a/kde-base/kpdf/kpdf-3.5.1.ebuild b/kde-base/kpdf/kpdf-3.5.1.ebuild
deleted file mode 100644
index 296e6b10b51a..000000000000
--- a/kde-base/kpdf/kpdf-3.5.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kpdf/kpdf-3.5.1.ebuild,v 1.3 2006/03/24 12:31:25 agriffis Exp $
-
-KMNAME=kdegraphics
-MAXKDEVER=$PV
-KM_DEPRANGE="$PV $MAXKDEVER"
-inherit kde-meta flag-o-matic
-
-DESCRIPTION="kpdf, a kde pdf viewer based on xpdf"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-KMEXTRA="kfile-plugins/pdf"
-
-DEPEND=">=media-libs/freetype-2.0.5
-	media-libs/t1lib
-	>=app-text/poppler-bindings-0.3.1"
-
-PATCHES="${FILESDIR}/${P}-saveas.patch"
-
-pkg_setup() {
-	if ! built_with_use app-text/poppler-bindings qt; then
-		eerror "This package requires app-text/poppler-bindings compiled with Qt support."
-		eerror "Please reemerge app-text/poppler-bindings with USE=\"qt\"."
-		die "Please reemerge app-text/poppler-bindings with USE=\"qt\"."
-	fi
-}
-
-src_compile() {
-	local myconf="--with-poppler"
-	replace-flags "-Os" "-O2" # see bug 114822
-	kde-meta_src_compile
-}