remove old

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

14 files changed, 4 insertions, 875 deletions

diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 61b4aca5e9fd..9749d4ba4aa4 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -1,52 +1,11 @@
-AUX poppler-0.4.3-pdf2xml.patch 840 RMD160 2aac51766cdb8129963efe9f59316d4e5b5df3e2 SHA1 86ef5b6e34f24e972f4d7c4ea251555e6ef46f79 SHA256 3289b6d4f927042de50ecc37e200e066af1c351b4f360ee31f459925adc4c078
-MD5 93baf580cd860acff7c064fe57408d32 files/poppler-0.4.3-pdf2xml.patch 840
-RMD160 2aac51766cdb8129963efe9f59316d4e5b5df3e2 files/poppler-0.4.3-pdf2xml.patch 840
-SHA256 3289b6d4f927042de50ecc37e200e066af1c351b4f360ee31f459925adc4c078 files/poppler-0.4.3-pdf2xml.patch 840
-AUX poppler-0.4.4-bug117481.patch 696 RMD160 68ea0d4abe21b9c7564cae4800ccfbde91199815 SHA1 6b74f71e9aaa092d9bdbe7f71b14d603239ee5b2 SHA256 4b9bcc3a1daaa9c15a0d31ac0cbfc9579d784fb97295deb1fb6f2fde7d011ab5
-MD5 63413b6d02c3bc97a966821e7befd8eb files/poppler-0.4.4-bug117481.patch 696
-RMD160 68ea0d4abe21b9c7564cae4800ccfbde91199815 files/poppler-0.4.4-bug117481.patch 696
-SHA256 4b9bcc3a1daaa9c15a0d31ac0cbfc9579d784fb97295deb1fb6f2fde7d011ab5 files/poppler-0.4.4-bug117481.patch 696
-AUX poppler-0.4.4-cairo-lines.patch 760 RMD160 3a585f74d26366ef3cc683e45817d7811818772f SHA1 2c72c91d6efe7d6a5951bb36cd124780ac2d8812 SHA256 7239ee405bfef2b95254721d1c9b52c36dfa33519bd9c8a6191f7e7554af8080
-MD5 29dc1ccc279993123bd97abfe9d60287 files/poppler-0.4.4-cairo-lines.patch 760
-RMD160 3a585f74d26366ef3cc683e45817d7811818772f files/poppler-0.4.4-cairo-lines.patch 760
-SHA256 7239ee405bfef2b95254721d1c9b52c36dfa33519bd9c8a6191f7e7554af8080 files/poppler-0.4.4-cairo-lines.patch 760
-AUX poppler-0.5.0-cairo-ft.patch 481 RMD160 c31fbb2351fa8eef0ac2468a90bc29f58ca27ede SHA1 7b340f1f1c3421579b02c31cd84406f4c8952147 SHA256 bcb87b10de3e045963ae792527331eec8e7b509babcc8edd34362bc0ca33f7c7
-MD5 e225a2f3c1263f09bcf7ee2f45b55305 files/poppler-0.5.0-cairo-ft.patch 481
-RMD160 c31fbb2351fa8eef0ac2468a90bc29f58ca27ede files/poppler-0.5.0-cairo-ft.patch 481
-SHA256 bcb87b10de3e045963ae792527331eec8e7b509babcc8edd34362bc0ca33f7c7 files/poppler-0.5.0-cairo-ft.patch 481
-AUX poppler-0.5.0-pdftoppm.patch 12753 RMD160 fcfa6a02d79c838de72f98e1eb23d64f24fe7d49 SHA1 9c9ea170f93e8cf2a91d482255f847aa098c4a6c SHA256 abe22e02f81b01daf32b56c636d5f9403117de0c14e81c5b62e6a5733da842d4
-MD5 19ede1dde409a9d6df6f6c29a0383090 files/poppler-0.5.0-pdftoppm.patch 12753
-RMD160 fcfa6a02d79c838de72f98e1eb23d64f24fe7d49 files/poppler-0.5.0-pdftoppm.patch 12753
-SHA256 abe22e02f81b01daf32b56c636d5f9403117de0c14e81c5b62e6a5733da842d4 files/poppler-0.5.0-pdftoppm.patch 12753
-AUX poppler-0.5.0-splash-overflow.patch 1383 RMD160 9a203c0be60621d5f5a6e9d0df011e1646da14f5 SHA1 082dd365be95fb041820fbcbf4c08742fe8638b6 SHA256 69eec22b540bccfc988b26ad3bf7d29039ff04e2dbc19556281342438604f142
-MD5 c8444c59ca7271ab6a5fc67dc0dd539a files/poppler-0.5.0-splash-overflow.patch 1383
-RMD160 9a203c0be60621d5f5a6e9d0df011e1646da14f5 files/poppler-0.5.0-splash-overflow.patch 1383
-SHA256 69eec22b540bccfc988b26ad3bf7d29039ff04e2dbc19556281342438604f142 files/poppler-0.5.0-splash-overflow.patch 1383
-AUX poppler-0.5.0-try-all-fonts.patch 2867 RMD160 7488663a61c327e781e0c66b918e1014941a0d63 SHA1 5bd8a5ce3a697f1db15a9c9657eb1ceee0e29b0e SHA256 3af95845d30dc3161b2f9a115c3c2bd2464e4854b831d5cd9e52216ba9f52c5f
-MD5 d7766c9a19980b40524d8050a1f25cff files/poppler-0.5.0-try-all-fonts.patch 2867
-RMD160 7488663a61c327e781e0c66b918e1014941a0d63 files/poppler-0.5.0-try-all-fonts.patch 2867
-SHA256 3af95845d30dc3161b2f9a115c3c2bd2464e4854b831d5cd9e52216ba9f52c5f files/poppler-0.5.0-try-all-fonts.patch 2867
-DIST poppler-0.5.0.tar.gz 935312 RMD160 a5bad2dd16a7b99b931c15757ff33591f2c4307a SHA1 90271c6195af8797579fc4867bcf7cd8975d60b1 SHA256 554fad3767c23c96ad886fe0220073133016d64f416273c26aea43ea80d4563b
 DIST poppler-0.5.1-cvs20060401.patch.bz2 41297 RMD160 35659844e017eeacf16da6172377b8e144201b61 SHA1 e3957986c7b5ab20ae95839479f8d3b7d23d2cdc SHA256 56e1c52451a14c2d6eba7f55eece60102e2ee5dd2fb24aeb18e584d0109cf027
 DIST poppler-0.5.1.tar.gz 954930 RMD160 ffd39323da0e0c487a6e7de48d8a607385189ddd SHA1 8d654a0f8eb6ad8c8cb08ced24a06f1f5b13c711 SHA256 2ee3f06d64dd703a2411428169fe21c17f6358950bb797d52ca8eebd1dcf1abe
 DIST poppler-0.5.3.tar.gz 1049900 RMD160 3456de23955fc4001842c76d32deba308bd7f968 SHA1 e197f5cf56f0676b5ca313577dd6456a393c46ec SHA256 5cfabff39670610fa8f5c33da7b9b0ae89d445445be6d6c245cdce8bf3f24190
 DIST poppler-0.5.4.tar.gz 1062401 RMD160 f28c89b03388757067505df3c60a1d878626b0dd SHA1 edf4e4ff17ef86a7f60f097949ad7db53fa2c3b1 SHA256 ca0f880a4ff07391e99b443f0e7c9860241df6a6aaa327b9d811b358d94a29c9
-EBUILD poppler-0.5.0-r4.ebuild 1701 RMD160 2157bbccd6a1522bc0e8dbd0dc4d0966f0674a38 SHA1 94679bc563d426b910e98d4f45f092931163f5a2 SHA256 4d4cdd4aa7647478026056f99e74da6ee0d7e63d3b2550df2982a48e011f16ad
-MD5 33b41bbfca983fc9864807186910749e poppler-0.5.0-r4.ebuild 1701
-RMD160 2157bbccd6a1522bc0e8dbd0dc4d0966f0674a38 poppler-0.5.0-r4.ebuild 1701
-SHA256 4d4cdd4aa7647478026056f99e74da6ee0d7e63d3b2550df2982a48e011f16ad poppler-0.5.0-r4.ebuild 1701
-EBUILD poppler-0.5.0-r5.ebuild 1738 RMD160 ed7fa0b2133361011fe86147cf69c09953a2187a SHA1 3b51aa244821d24179333779a9179354d43cfed8 SHA256 91b028f79f8624202646af8e74a8972295130890726c11bfdd50ef6003b7f331
-MD5 f1c90d5ac529421125cad0331aa3071d poppler-0.5.0-r5.ebuild 1738
-RMD160 ed7fa0b2133361011fe86147cf69c09953a2187a poppler-0.5.0-r5.ebuild 1738
-SHA256 91b028f79f8624202646af8e74a8972295130890726c11bfdd50ef6003b7f331 poppler-0.5.0-r5.ebuild 1738
 EBUILD poppler-0.5.1-r1.ebuild 1589 RMD160 d9556fd04276cc59a36ef2b929ec7fa2e49f4ba8 SHA1 7248e933cec726e67fa8cc989a9f4fe5dcc3fbba SHA256 30413dcb174859bb8fd1429b2b5f58a506d3e31bc7f3cd27b1f5c6eaef907f3b
 MD5 779fe6e789674db9f74ac05c325cd153 poppler-0.5.1-r1.ebuild 1589
 RMD160 d9556fd04276cc59a36ef2b929ec7fa2e49f4ba8 poppler-0.5.1-r1.ebuild 1589
 SHA256 30413dcb174859bb8fd1429b2b5f58a506d3e31bc7f3cd27b1f5c6eaef907f3b poppler-0.5.1-r1.ebuild 1589
-EBUILD poppler-0.5.1.ebuild 1402 RMD160 7e1351ed0478fdc624416de550ce591e9683600e SHA1 88eb53581033a83c97b60ab0c19f1f48ec29ce46 SHA256 578f794fdf1b09cc599361c03ba86fbf33a3336b74e839351b41b69391ff89f2
-MD5 dd03564de52a857977083840ed33018e poppler-0.5.1.ebuild 1402
-RMD160 7e1351ed0478fdc624416de550ce591e9683600e poppler-0.5.1.ebuild 1402
-SHA256 578f794fdf1b09cc599361c03ba86fbf33a3336b74e839351b41b69391ff89f2 poppler-0.5.1.ebuild 1402
 EBUILD poppler-0.5.3.ebuild 1439 RMD160 e9781cfa89726a78ec4c3c214631adef54cfba9c SHA1 8126d6469825a4900d0be59e1bf661a9915a33af SHA256 e13f02b5b9d9c4ccf0f32f349e0064f3140ccfc1a4f9eb41c51790bece2a5042
 MD5 901b740536537596acf3ec683a6ce599 poppler-0.5.3.ebuild 1439
 RMD160 e9781cfa89726a78ec4c3c214631adef54cfba9c poppler-0.5.3.ebuild 1439
@@ -55,23 +14,14 @@ EBUILD poppler-0.5.4.ebuild 1487 RMD160 4aff2992955e9adca085e451073c3f607731327f
 MD5 bcd5aaddf4335e6c86fb6552a0c18664 poppler-0.5.4.ebuild 1487
 RMD160 4aff2992955e9adca085e451073c3f607731327f poppler-0.5.4.ebuild 1487
 SHA256 a8d59b7e893d9711e1c10eeeb1cc4fe85fe0feef7985e98be3b396d46278f745 poppler-0.5.4.ebuild 1487
-MISC ChangeLog 13866 RMD160 1b0a338a50425ac0b14c02a66c7f39d7b91f9996 SHA1 ead16a2aacc08ec9fd4c4da5d5655a451fb83dd1 SHA256 c9fd79982e8d0afd6957026f9e259c6f651cc15afe9ac10ed57d1332aa2452af
-MD5 b259bf17e880dc9499b76d3e4ea52986 ChangeLog 13866
-RMD160 1b0a338a50425ac0b14c02a66c7f39d7b91f9996 ChangeLog 13866
-SHA256 c9fd79982e8d0afd6957026f9e259c6f651cc15afe9ac10ed57d1332aa2452af ChangeLog 13866
+MISC ChangeLog 14294 RMD160 46602c2213ad8782be5be519ad0e216605dbbcd9 SHA1 07aad3dc35cfae6023a2c7a866ee7f451f03d714 SHA256 d214b45ef96fc8f3b6c8191fd80da4dfd7d4a8fb88bca552658ac13a176b85b1
+MD5 e8fb1757e9a3f532fbce971ea9043460 ChangeLog 14294
+RMD160 46602c2213ad8782be5be519ad0e216605dbbcd9 ChangeLog 14294
+SHA256 d214b45ef96fc8f3b6c8191fd80da4dfd7d4a8fb88bca552658ac13a176b85b1 ChangeLog 14294
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 metadata.xml 161
 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76 metadata.xml 161
-MD5 e876193dfd11bf13602043abf0ecec21 files/digest-poppler-0.5.0-r4 241
-RMD160 4ac5024c341597422cfd4e2a1625b6ff9f1b4e6f files/digest-poppler-0.5.0-r4 241
-SHA256 51bb8ae71c9ac143ae67a7cecb81aa02fdf8798baf3bc90ebb499692ba5d3ea7 files/digest-poppler-0.5.0-r4 241
-MD5 e876193dfd11bf13602043abf0ecec21 files/digest-poppler-0.5.0-r5 241
-RMD160 4ac5024c341597422cfd4e2a1625b6ff9f1b4e6f files/digest-poppler-0.5.0-r5 241
-SHA256 51bb8ae71c9ac143ae67a7cecb81aa02fdf8798baf3bc90ebb499692ba5d3ea7 files/digest-poppler-0.5.0-r5 241
-MD5 bfbec6a51d5b284cf7d771906303774e files/digest-poppler-0.5.1 241
-RMD160 1c8ffab9e42cce045bee08a442a00c45310e0fa6 files/digest-poppler-0.5.1 241
-SHA256 77347834bd17a13a58e26dbeeeb04dbec2c24683a03d7d5d29ade883897355bf files/digest-poppler-0.5.1 241
 MD5 536189ff37491801ccc8e97791212f95 files/digest-poppler-0.5.1-r1 524
 RMD160 44cded8464779364da3b5fbd4966d442fb96a244 files/digest-poppler-0.5.1-r1 524
 SHA256 a1bc0d718cd6203e4849066bcee67f97b04e8dcb80a354029daf2124a84500a7 files/digest-poppler-0.5.1-r1 524
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;
- }
diff --git a/app-text/poppler/poppler-0.5.0-r4.ebuild b/app-text/poppler/poppler-0.5.0-r4.ebuild
deleted file mode 100644
index c043e8014383..000000000000
--- a/app-text/poppler/poppler-0.5.0-r4.ebuild
+++ /dev/null
@@ -1,61 +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/poppler/poppler-0.5.0-r4.ebuild,v 1.13 2006/04/04 20:50:34 genstef Exp $
-
-inherit autotools eutils flag-o-matic
-
-DESCRIPTION="Poppler is a PDF rendering library based on the xpdf-3.0 code base."
-HOMEPAGE="http://poppler.freedesktop.org"
-SRC_URI="http://poppler.freedesktop.org/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86"
-IUSE="jpeg zlib cairo"
-
-RDEPEND=">=media-libs/freetype-2.1.8
-	media-libs/fontconfig
-	cairo? ( >=x11-libs/cairo-0.5 )
-	jpeg? ( >=media-libs/jpeg-6b )
-	zlib? ( sys-libs/zlib )
-	!app-text/pdftohtml"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	>=sys-devel/automake-1.9.6"
-
-src_unpack(){
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-cairo-ft.patch
-	epatch ${FILESDIR}/${PN}-0.4.4-bug117481.patch
-	epatch ${FILESDIR}/${PN}-0.4.3-pdf2xml.patch
-	epatch ${FILESDIR}/${PN}-0.4.4-cairo-lines.patch
-	# bug #119898
-	epatch ${FILESDIR}/${P}-try-all-fonts.patch
-	epatch ${FILESDIR}/${P}-splash-overflow.patch
-	epatch ${FILESDIR}/${P}-pdftoppm.patch
-	AT_M4DIR="m4" eautoreconf
-}
-
-src_compile() {
-	# -Os is broken, see bug 124179
-	replace-flags -Os -O2
-
-	econf --disable-poppler-qt4 \
-		--disable-poppler-glib \
-		--disable-poppler-qt \
-		--disable-gtk-test \
-		--enable-opi \
-		--enable-xpdf-headers \
-		$(use_enable cairo cairo-output) \
-		$(use_enable jpeg libjpeg) \
-		$(use_enable zlib) \
-		|| die "configuration failed"
-	emake || die "compilation failed"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	dodoc README AUTHORS ChangeLog NEWS README-XPDF TODO pdf2xml.dtd
-}
diff --git a/app-text/poppler/poppler-0.5.0-r5.ebuild b/app-text/poppler/poppler-0.5.0-r5.ebuild
deleted file mode 100644
index 34a53cb7f78a..000000000000
--- a/app-text/poppler/poppler-0.5.0-r5.ebuild
+++ /dev/null
@@ -1,61 +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/poppler/poppler-0.5.0-r5.ebuild,v 1.13 2006/04/04 20:50:34 genstef Exp $
-
-inherit autotools eutils flag-o-matic
-
-DESCRIPTION="Poppler is a PDF rendering library based on the xpdf-3.0 code base."
-HOMEPAGE="http://poppler.freedesktop.org"
-SRC_URI="http://poppler.freedesktop.org/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="jpeg cairo"
-
-RDEPEND=">=media-libs/freetype-2.1.8
-	media-libs/fontconfig
-	cairo? ( >=x11-libs/cairo-0.5 )
-	jpeg? ( >=media-libs/jpeg-6b )
-	!app-text/pdftohtml"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	>=sys-devel/automake-1.9.6"
-
-src_unpack(){
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-cairo-ft.patch
-	epatch ${FILESDIR}/${PN}-0.4.4-bug117481.patch
-	epatch ${FILESDIR}/${PN}-0.4.3-pdf2xml.patch
-	epatch ${FILESDIR}/${PN}-0.4.4-cairo-lines.patch
-	# bug #119898
-	epatch ${FILESDIR}/${P}-try-all-fonts.patch
-	epatch ${FILESDIR}/${P}-splash-overflow.patch
-	epatch ${FILESDIR}/${P}-pdftoppm.patch
-	AT_M4DIR="m4" eautoreconf
-}
-
-src_compile() {
-	# -Os is broken, see bug 124179
-	replace-flags -Os -O2
-
-	econf --disable-poppler-qt4 \
-		--disable-poppler-glib \
-		--disable-poppler-qt \
-		--disable-gtk-test \
-		--enable-opi \
-		--enable-xpdf-headers \
-		$(use_enable cairo cairo-output) \
-		$(use_enable jpeg libjpeg) \
-		|| die "configuration failed"
-		# $(use_enable zlib) breaks, see
-		# https://bugs.freedesktop.org/show_bug.cgi?id=3948
-	emake || die "compilation failed"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	dodoc README AUTHORS ChangeLog NEWS README-XPDF TODO pdf2xml.dtd
-}
diff --git a/app-text/poppler/poppler-0.5.1.ebuild b/app-text/poppler/poppler-0.5.1.ebuild
deleted file mode 100644
index 5e5146d25c23..000000000000
--- a/app-text/poppler/poppler-0.5.1.ebuild
+++ /dev/null
@@ -1,50 +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/poppler/poppler-0.5.1.ebuild,v 1.7 2006/07/22 20:07:29 psi29a Exp $
-
-inherit flag-o-matic
-
-DESCRIPTION="Poppler is a PDF rendering library based on the xpdf-3.0 code base."
-HOMEPAGE="http://poppler.freedesktop.org"
-SRC_URI="http://poppler.freedesktop.org/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~hppa ~ia64 mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="jpeg"
-
-RDEPEND=">=media-libs/freetype-2.1.8
-	media-libs/fontconfig
-	jpeg? ( >=media-libs/jpeg-6b )
-	!app-text/pdftohtml"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	>=sys-devel/automake-1.9.6"
-
-src_compile() {
-	# -Os is broken, see bug 124179
-	replace-flags -Os -O2
-
-	econf --disable-poppler-qt4 \
-		--disable-poppler-glib \
-		--disable-poppler-qt \
-		--disable-gtk-test \
-		--enable-opi \
-		--disable-cairo-output \
-		--enable-xpdf-headers \
-		$(use_enable jpeg libjpeg) \
-		|| die "configuration failed"
-		# $(use_enable zlib) breaks, see
-		# https://bugs.freedesktop.org/show_bug.cgi?id=3948
-	emake || die "compilation failed"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die "make install failed"
-	dodoc README AUTHORS ChangeLog NEWS README-XPDF TODO pdf2xml.dtd
-}
-
-pkg_postinst() {
-	ewarn "You need to rebuild everything depending on poppler, use revdep-rebuild"
-}