Bump to 0.4.2

(Portage version: 2.0.52-r1)

4 files changed, 60 insertions, 12 deletions

diff --git a/app-text/poppler/ChangeLog b/app-text/poppler/ChangeLog
index 98ad718d3d19..71e8095d5430 100644
--- a/app-text/poppler/ChangeLog
+++ b/app-text/poppler/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/poppler
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.13 2005/09/22 14:50:47 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.14 2005/09/28 15:12:04 dang Exp $
+
+*poppler-0.4.2 (28 Sep 2005)
+
+  28 Sep 2005; <dang@gentoo.org> +poppler-0.4.2.ebuild:
+  Bump to 0.4.2. Bug #105107.  Disable cairo by default, Bug #104830
 
   22 Sep 2005; <dang@gentoo.org> poppler-0.4.1.ebuild:
   Force automake 1.9
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 4f9e1d9cfc35..c02b6d4fc457 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -1,21 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 d2c3a8a3ea5a2609eaf2289b3995dea4 poppler-0.3.3.ebuild 939
 MD5 d7a0327f479e0afd0bd13cd6cbf00f89 poppler-0.4.1.ebuild 1073
 MD5 2775f0555069e7375c82e6898951cc98 poppler-0.3.0.ebuild 860
 MD5 0f47305adf0da4f94dc6ef03291cd175 poppler-0.3.2.ebuild 941
-MD5 c9ff43a19769bec23df6362c2f156b53 ChangeLog 1698
+MD5 83e82d72967b5504037903dd311122ea ChangeLog 1814
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
+MD5 204dc24a40da502d6cf922537e6014e2 poppler-0.4.2.ebuild 1223
 MD5 3342aad1175b4b522f84e453999fbb05 files/poppler-0.4.1-cairo-ft.patch 470
 MD5 9fcae20e4d0c670e6f53602e516991aa files/digest-poppler-0.3.0 65
 MD5 25675c998a475fcdd58b64313df002b5 files/digest-poppler-0.3.2 65
 MD5 ffa0dcdb55709d044c7cefd7da512fe8 files/digest-poppler-0.3.3 65
 MD5 ff3789d555c986604a49249f0df50c8a files/digest-poppler-0.4.1 65
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDMsYOomPajV0RnrERAkxyAJ4nmyyn8cvO1xbRScnMMWljladGTgCbB4nG
-Tzs9/MlQF1kI5tBvTUQI87M=
-=MnPI
------END PGP SIGNATURE-----
+MD5 be62fc9641cde65e89b62b2a629bb617 files/digest-poppler-0.4.2 65
diff --git a/app-text/poppler/files/digest-poppler-0.4.2 b/app-text/poppler/files/digest-poppler-0.4.2
new file mode 100644
index 000000000000..2c60c15e4850
--- /dev/null
+++ b/app-text/poppler/files/digest-poppler-0.4.2
@@ -0,0 +1 @@
+MD5 beb1eea135a3c5b679a7a22d01a500c0 poppler-0.4.2.tar.gz 777935
diff --git a/app-text/poppler/poppler-0.4.2.ebuild b/app-text/poppler/poppler-0.4.2.ebuild
new file mode 100644
index 000000000000..6fa4d97bf3e7
--- /dev/null
+++ b/app-text/poppler/poppler-0.4.2.ebuild
@@ -0,0 +1,50 @@
+# 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.1 2005/09/28 15:12:04 dang 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 is in package.mask
+
+RDEPEND=">=media-libs/freetype-2.1.8
+	media-libs/fontconfig
+	virtual/ghostscript
+	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 \
+		--disable-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
+}