Bit poppler cleanup

Package-Manager: portage-2.1_pre3-r1

17 files changed, 111 insertions, 238 deletions

diff --git a/app-text/poppler/ChangeLog b/app-text/poppler/ChangeLog
index 6e1f6a82f339..b16ed3a56e2c 100644
--- a/app-text/poppler/ChangeLog
+++ b/app-text/poppler/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for app-text/poppler
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.45 2006/01/14 20:58:04 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.46 2006/01/19 19:10:52 dang Exp $
+
+*poppler-0.4.4 (19 Jan 2006)
+
+  19 Jan 2006; <dang@gentoo.org> +files/poppler-0.4.3-pdf2xml.patch,
+  +files/poppler-0.4.4-bug117481.patch,
+  +files/poppler-0.4.4-cairo-lines.patch, -poppler-0.4.2.ebuild,
+  -poppler-0.4.3.ebuild, -poppler-0.4.3-r1.ebuild, -poppler-0.4.3-r2.ebuild,
+  -poppler-0.4.3-r3.ebuild, poppler-0.4.3-r4.ebuild, +poppler-0.4.4.ebuild:
+  The big poppler cleanup:
+  	- Add new poppler rev 0.4.4
+	- Remove currently unneeded poppler versions 0.4.2, and 0.4.3 - 0.4.3-r3
+	- Add ghostscript depend to poppler. (previous commit lost)
+	- Add pdf3xml.dtd to poppler. (previous commit lost)
 
   14 Jan 2006; <dang@gentoo.org> poppler-0.4.3-r4.ebuild:
   Don't need ghostscript
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 2c3923bbe15d..eaca125c693d 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -1,36 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 22016128c5425d009bc69b884bbe3a7e ChangeLog 5749
+MD5 4cc051ad0b6898ac0f38dbbe7a85c6f4 ChangeLog 6354
 MD5 9fcae20e4d0c670e6f53602e516991aa files/digest-poppler-0.3.0 65
 MD5 9fcae20e4d0c670e6f53602e516991aa files/digest-poppler-0.3.0-r1 65
-MD5 be62fc9641cde65e89b62b2a629bb617 files/digest-poppler-0.4.2 65
 MD5 be62fc9641cde65e89b62b2a629bb617 files/digest-poppler-0.4.2-r1 65
-MD5 fd7bca7be5c5d5779b32f4c4e7fe9b4c files/digest-poppler-0.4.3 65
-MD5 91f251deb3a322d16a5ea68576f1c9a9 files/digest-poppler-0.4.3-r1 137
-MD5 91f251deb3a322d16a5ea68576f1c9a9 files/digest-poppler-0.4.3-r2 137
-MD5 91f251deb3a322d16a5ea68576f1c9a9 files/digest-poppler-0.4.3-r3 137
 MD5 91f251deb3a322d16a5ea68576f1c9a9 files/digest-poppler-0.4.3-r4 137
+MD5 549a2b9f8016feedcb7a4fa849aa28e3 files/digest-poppler-0.4.4 137
 MD5 3342aad1175b4b522f84e453999fbb05 files/poppler-0.4.1-cairo-ft.patch 470
 MD5 c6805b961ecb2a526246a39bbff57f23 files/poppler-0.4.2-CAN-2005-3193.patch 3940
 MD5 85f437a5b01fef3f2139fcee826c4c6a files/poppler-0.4.3-bug117481.patch 2593
 MD5 8b92823cdaec86c3cb5993440d95c306 files/poppler-0.4.3-gcc41.patch 479
+MD5 93baf580cd860acff7c064fe57408d32 files/poppler-0.4.3-pdf2xml.patch 840
+MD5 63413b6d02c3bc97a966821e7befd8eb files/poppler-0.4.4-bug117481.patch 696
+MD5 29dc1ccc279993123bd97abfe9d60287 files/poppler-0.4.4-cairo-lines.patch 760
 MD5 f52250f6bc64f4201e663a46ed126f9b files/poppler-gcc41.patch 1131
 MD5 580dbf31fbeac60b3e29d38fdeabc4f1 files/poppler-no-libjpeg.patch 773
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
 MD5 2638f0cdd789bc7e7ffd78e5b1555008 poppler-0.3.0-r1.ebuild 1019
 MD5 6999412acc1316a8e229eada23ab192b poppler-0.3.0.ebuild 856
 MD5 e9d6d5b72e5ba3ca39372fa29ff9ffb7 poppler-0.4.2-r1.ebuild 1442
-MD5 0a4aeea8b99f0bde18dd89db5fc6d313 poppler-0.4.2.ebuild 1383
-MD5 aadc332cb628ee3dbee13cffc0682acf poppler-0.4.3-r1.ebuild 1467
-MD5 23a4cfea729b004e919713beb75035a2 poppler-0.4.3-r2.ebuild 1377
-MD5 56e58601b60af35c7a06bae16d88a4d4 poppler-0.4.3-r3.ebuild 1466
-MD5 8340d3401e19d4a0efa091e0306b0ee0 poppler-0.4.3-r4.ebuild 1506
-MD5 73581022e21e0c1521e08454a71ca131 poppler-0.4.3.ebuild 1350
+MD5 49580afaf5b4b9002297bf66e452f9bf poppler-0.4.3-r4.ebuild 1576
+MD5 fb29205148f6f6e6ce94b5587f4aecad poppler-0.4.4.ebuild 1532
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
+Version: GnuPG v1.4.2-ecc0.1.6 (GNU/Linux)
 
-iD8DBQFDyaYO2+ySkm8kpY0RAiTFAKCBKvbjuAzPF0QBbWJXB4jxVuwZUQCfV8mk
-I8lZJ/eDEHEDxfZicYxIOn8=
-=bJsG
+iD8DBQFDz+RtomPajV0RnrERAjeRAJ90nfLvo7Xysm6txYpbmS7rX/BU5wCfSyab
+Y7d/tUWDkbHo+IjleTqEf1A=
+=548X
 -----END PGP SIGNATURE-----
diff --git a/app-text/poppler/files/digest-poppler-0.4.2 b/app-text/poppler/files/digest-poppler-0.4.2
deleted file mode 100644
index 2c60c15e4850..000000000000
--- a/app-text/poppler/files/digest-poppler-0.4.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 beb1eea135a3c5b679a7a22d01a500c0 poppler-0.4.2.tar.gz 777935
diff --git a/app-text/poppler/files/digest-poppler-0.4.3 b/app-text/poppler/files/digest-poppler-0.4.3
deleted file mode 100644
index 737819686e59..000000000000
--- a/app-text/poppler/files/digest-poppler-0.4.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 791dc78d8366eb05580183fe85174555 poppler-0.4.3.tar.gz 779582
diff --git a/app-text/poppler/files/digest-poppler-0.4.3-r1 b/app-text/poppler/files/digest-poppler-0.4.3-r1
deleted file mode 100644
index 101e5bbaf715..000000000000
--- a/app-text/poppler/files/digest-poppler-0.4.3-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 7952d78e9dece4f6f04a96af8185e197 poppler-0.4.3-utils.patch.gz 46235
-MD5 791dc78d8366eb05580183fe85174555 poppler-0.4.3.tar.gz 779582
diff --git a/app-text/poppler/files/digest-poppler-0.4.3-r2 b/app-text/poppler/files/digest-poppler-0.4.3-r2
deleted file mode 100644
index 101e5bbaf715..000000000000
--- a/app-text/poppler/files/digest-poppler-0.4.3-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 7952d78e9dece4f6f04a96af8185e197 poppler-0.4.3-utils.patch.gz 46235
-MD5 791dc78d8366eb05580183fe85174555 poppler-0.4.3.tar.gz 779582
diff --git a/app-text/poppler/files/digest-poppler-0.4.3-r3 b/app-text/poppler/files/digest-poppler-0.4.3-r3
deleted file mode 100644
index 101e5bbaf715..000000000000
--- a/app-text/poppler/files/digest-poppler-0.4.3-r3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 7952d78e9dece4f6f04a96af8185e197 poppler-0.4.3-utils.patch.gz 46235
-MD5 791dc78d8366eb05580183fe85174555 poppler-0.4.3.tar.gz 779582
diff --git a/app-text/poppler/files/digest-poppler-0.4.4 b/app-text/poppler/files/digest-poppler-0.4.4
new file mode 100644
index 000000000000..9a717b92ae3c
--- /dev/null
+++ b/app-text/poppler/files/digest-poppler-0.4.4
@@ -0,0 +1,2 @@
+MD5 9d70b144fcb400439bbdbb53c651257f poppler-0.4.4-utils.patch.gz 46293
+MD5 e081bca749a3373b2d95e696b7dddb9b poppler-0.4.4.tar.gz 783571
diff --git a/app-text/poppler/files/poppler-0.4.3-pdf2xml.patch b/app-text/poppler/files/poppler-0.4.3-pdf2xml.patch
new file mode 100644
index 000000000000..de6e69bce6af
--- /dev/null
+++ b/app-text/poppler/files/poppler-0.4.3-pdf2xml.patch
@@ -0,0 +1,32 @@
+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
new file mode 100644
index 000000000000..8e49388f27d3
--- /dev/null
+++ b/app-text/poppler/files/poppler-0.4.4-bug117481.patch
@@ -0,0 +1,23 @@
+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
new file mode 100644
index 000000000000..30cd2614ab75
--- /dev/null
+++ b/app-text/poppler/files/poppler-0.4.4-cairo-lines.patch
@@ -0,0 +1,16 @@
+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/poppler-0.4.2.ebuild b/app-text/poppler/poppler-0.4.2.ebuild
deleted file mode 100644
index 4a8d398b58ea..000000000000
--- a/app-text/poppler/poppler-0.4.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.4.2.ebuild,v 1.3 2005/11/29 21:27:18 hanno Exp $
-
-inherit eutils autotools
-
-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 ~ppc ~ppc64 ~sparc ~x86 ~mips"
-IUSE="gtk jpeg qt zlib cairo"
-
-RDEPEND=">=media-libs/freetype-2.1.8
-	media-libs/fontconfig
-	virtual/ghostscript
-	cairo? ( >=x11-libs/cairo-0.5 )
-	gtk? ( >=x11-libs/gtk+-2.4 )
-	qt? ( =x11-libs/qt-3* )
-	jpeg? ( >=media-libs/jpeg-6b )
-	zlib? ( sys-libs/zlib )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	>=sys-devel/automake-1.9.6"
-
-src_unpack(){
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/poppler-0.4.1-cairo-ft.patch
-	epatch ${FILESDIR}/poppler-gcc41.patch
-	eautoreconf
-}
-
-src_compile() {
-	econf --disable-poppler-qt4 --enable-opi \
-		$(use_enable cairo cairo-output) \
-		$(use_enable jpeg libjpeg) \
-		$(use_enable zlib) \
-		$(use_enable gtk poppler-glib) \
-		$(use_enable qt poppler-qt) \
-		|| die "configuration failed"
-	emake || die "compilation failed"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	dodoc README AUTHORS ChangeLog NEWS README-XPDF TODO
-}
diff --git a/app-text/poppler/poppler-0.4.3-r1.ebuild b/app-text/poppler/poppler-0.4.3-r1.ebuild
deleted file mode 100644
index eaaeaa8b5956..000000000000
--- a/app-text/poppler/poppler-0.4.3-r1.ebuild
+++ /dev/null
@@ -1,53 +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.4.3-r1.ebuild,v 1.4 2006/01/04 06:13:57 vapier Exp $
-
-inherit eutils autotools
-
-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
-	mirror://gentoo/${P}-utils.patch.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="gtk jpeg qt zlib cairo"
-
-RDEPEND=">=media-libs/freetype-2.1.8
-	media-libs/fontconfig
-	virtual/ghostscript
-	cairo? ( >=x11-libs/cairo-0.5 )
-	gtk? ( >=x11-libs/gtk+-2.4 )
-	qt? ( =x11-libs/qt-3* )
-	jpeg? ( >=media-libs/jpeg-6b )
-	zlib? ( sys-libs/zlib )
-	!<app-text/xpdf-3.01-r4"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	>=sys-devel/automake-1.9.6"
-
-src_unpack(){
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/poppler-0.4.1-cairo-ft.patch
-	epatch ${DISTDIR}/poppler-0.4.3-utils.patch.gz
-	eautoreconf
-}
-
-src_compile() {
-	econf --disable-poppler-qt4 --enable-opi \
-		$(use_enable cairo cairo-output) \
-		$(use_enable jpeg libjpeg) \
-		$(use_enable zlib) \
-		$(use_enable gtk poppler-glib) \
-		$(use_enable qt poppler-qt) \
-		|| die "configuration failed"
-	emake || die "compilation failed"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	dodoc README AUTHORS ChangeLog NEWS README-XPDF TODO
-}
diff --git a/app-text/poppler/poppler-0.4.3-r2.ebuild b/app-text/poppler/poppler-0.4.3-r2.ebuild
deleted file mode 100644
index 6c92db970d78..000000000000
--- a/app-text/poppler/poppler-0.4.3-r2.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.4.3-r2.ebuild,v 1.2 2006/01/04 06:13:57 vapier Exp $
-
-inherit eutils autotools
-
-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
-	mirror://gentoo/${P}-utils.patch.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
-	virtual/ghostscript
-	cairo? ( >=x11-libs/cairo-0.5 )
-	jpeg? ( >=media-libs/jpeg-6b )
-	zlib? ( sys-libs/zlib )
-	!<app-text/xpdf-3.01-r4"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	>=sys-devel/automake-1.9.6"
-
-src_unpack(){
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/poppler-0.4.1-cairo-ft.patch
-	epatch ${DISTDIR}/${P}-utils.patch.gz
-	eautoreconf
-}
-
-src_compile() {
-	econf --disable-poppler-qt4 --enable-opi \
-		--disable-poppler-glib --disable-poppler-qt \
-		$(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
-}
diff --git a/app-text/poppler/poppler-0.4.3-r4.ebuild b/app-text/poppler/poppler-0.4.3-r4.ebuild
index cc03fd4ebaf4..41c95057afbc 100644
--- a/app-text/poppler/poppler-0.4.3-r4.ebuild
+++ b/app-text/poppler/poppler-0.4.3-r4.ebuild
@@ -1,6 +1,6 @@
 # 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.4.3-r4.ebuild,v 1.13 2006/01/15 01:30:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.4.3-r4.ebuild,v 1.14 2006/01/19 19:10:52 dang Exp $
 
 inherit eutils autotools
 
@@ -20,7 +20,8 @@ RDEPEND=">=media-libs/freetype-2.1.8
 	jpeg? ( >=media-libs/jpeg-6b )
 	zlib? ( sys-libs/zlib )
 	!app-text/pdftohtml
-	!<app-text/xpdf-3.01-r4"
+	!<app-text/xpdf-3.01-r4
+	virtual/ghostscript"
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
@@ -34,6 +35,7 @@ src_unpack(){
 	epatch ${FILESDIR}/poppler-no-libjpeg.patch
 	epatch ${FILESDIR}/poppler-0.4.3-gcc41.patch
 	epatch ${FILESDIR}/poppler-0.4.3-bug117481.patch
+	epatch ${FILESDIR}/${P}-pdf2xml.patch
 	eautoreconf
 }
 
@@ -49,5 +51,5 @@ src_compile() {
 
 src_install() {
 	make DESTDIR=${D} install || die
-	dodoc README AUTHORS ChangeLog NEWS README-XPDF TODO
+	dodoc README AUTHORS ChangeLog NEWS README-XPDF TODO pdf2xml.dtd
 }
diff --git a/app-text/poppler/poppler-0.4.3.ebuild b/app-text/poppler/poppler-0.4.3.ebuild
deleted file mode 100644
index 3aa2bb7b1038..000000000000
--- a/app-text/poppler/poppler-0.4.3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.4.3.ebuild,v 1.2 2005/12/17 17:12:19 vapier Exp $
-
-inherit eutils autotools
-
-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 ~sparc ~x86"
-IUSE="gtk jpeg qt zlib cairo"
-
-RDEPEND=">=media-libs/freetype-2.1.8
-	media-libs/fontconfig
-	virtual/ghostscript
-	cairo? ( >=x11-libs/cairo-0.5 )
-	gtk? ( >=x11-libs/gtk+-2.4 )
-	qt? ( =x11-libs/qt-3* )
-	jpeg? ( >=media-libs/jpeg-6b )
-	zlib? ( sys-libs/zlib )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	>=sys-devel/automake-1.9.6"
-
-src_unpack(){
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/poppler-0.4.1-cairo-ft.patch
-	eautoreconf
-}
-
-src_compile() {
-	econf --disable-poppler-qt4 --enable-opi \
-		$(use_enable cairo cairo-output) \
-		$(use_enable jpeg libjpeg) \
-		$(use_enable zlib) \
-		$(use_enable gtk poppler-glib) \
-		$(use_enable qt poppler-qt) \
-		|| die "configuration failed"
-	emake || die "compilation failed"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	dodoc README AUTHORS ChangeLog NEWS README-XPDF TODO
-}
diff --git a/app-text/poppler/poppler-0.4.3-r3.ebuild b/app-text/poppler/poppler-0.4.4.ebuild
index 74423ddb22fd..58670467616a 100644
--- a/app-text/poppler/poppler-0.4.3-r3.ebuild
+++ b/app-text/poppler/poppler-0.4.4.ebuild
@@ -1,6 +1,6 @@
 # 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.4.3-r3.ebuild,v 1.1 2006/01/03 22:59:49 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.4.4.ebuild,v 1.1 2006/01/19 19:10:52 dang Exp $
 
 inherit eutils autotools
 
@@ -16,11 +16,12 @@ IUSE="jpeg zlib cairo"
 
 RDEPEND=">=media-libs/freetype-2.1.8
 	media-libs/fontconfig
-	virtual/ghostscript
 	cairo? ( >=x11-libs/cairo-0.5 )
 	jpeg? ( >=media-libs/jpeg-6b )
 	zlib? ( sys-libs/zlib )
-	!<app-text/xpdf-3.01-r4"
+	!app-text/pdftohtml
+	!<app-text/xpdf-3.01-r4
+	virtual/ghostscript"
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
@@ -31,8 +32,9 @@ src_unpack(){
 	cd ${S}
 	epatch ${WORKDIR}/${P}-utils.patch
 	epatch ${FILESDIR}/poppler-0.4.1-cairo-ft.patch
-	epatch ${FILESDIR}/poppler-no-libjpeg.patch
-	epatch ${FILESDIR}/poppler-0.4.3-gcc41.patch
+	epatch ${FILESDIR}/${P}-bug117481.patch
+	epatch ${FILESDIR}/${PN}-0.4.3-pdf2xml.patch
+	epatch ${FILESDIR}/${P}-cairo-lines.patch
 	eautoreconf
 }
 
@@ -48,5 +50,5 @@ src_compile() {
 
 src_install() {
 	make DESTDIR=${D} install || die
-	dodoc README AUTHORS ChangeLog NEWS README-XPDF TODO
+	dodoc README AUTHORS ChangeLog NEWS README-XPDF TODO pdf2xml.dtd
 }