--- poppler-0.4.1.ebuild	2005-09-07 06:17:57.000000000 +0200
+++ poppler-0.4.2.ebuild	2005-09-07 06:45:33.000000000 +0200
@@ -1,6 +1,6 @@
 # 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.1.ebuild,v 1.3 2005/09/02 00:16:17 dang Exp $
+# $Header: $
 
 inherit eutils
 
@@ -11,33 +11,39 @@
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~mips"
-IUSE="gtk qt"
+IUSE="cairo gtk jpeg qt zlib"
 
-# cairo is in packages.mask
-
-RDEPEND=">=media-libs/freetype-2.0.5
-	>=media-libs/t1lib-1.3
+RDEPEND=">=media-libs/freetype-2.1.8
 	media-libs/fontconfig
 	virtual/ghostscript
-	dev-util/pkgconfig
-	gtk? ( =x11-libs/gtk+-2* )
-	qt? ( =x11-libs/qt-3* )"
+	gtk? ( >=x11-libs/gtk+-2.4 )
+	qt? ( =x11-libs/qt-3* )
+	jpeg? ( >=media-libs/jpeg-6b )
+	cairo? ( >=x11-libs/cairo-0.5.0 )
+	zlib? ( sys-libs/zlib )"
 
 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}/poppler-0.4.1-cairo-ft.patch
 	autoconf || die "autoconf failed"
 	automake || die "automake failed"
 	libtoolize --force || die "libtoolize failed"
 }
 
 src_compile() {
-	econf $(use_enable qt poppler-qt) || die
-	emake || die
+	econf --disable-poppler-qt4 --enable-opi \
+		$(use_enable jpeg libjpeg) \
+		$(use_enable zlib) \
+		$(use_enable cairo cairo-output) \
+		$(use_enable gtk poppler-glib) \
+		$(use_enable qt poppler-qt) \
+		|| die "configuration failed"
+	emake || die "compilation failed"
 }
 
 src_install() {