Remove zlib because it is causing problems, see bug 122145 thanks to Alexander Stein <alexander.stein@informatik.tu-chemnitz.de>

Package-Manager: portage-2.1_pre4-r1

4 files changed, 80 insertions, 14 deletions

diff --git a/app-text/poppler/ChangeLog b/app-text/poppler/ChangeLog
index 3a8a14641620..1379f482c1f0 100644
--- a/app-text/poppler/ChangeLog
+++ b/app-text/poppler/ChangeLog
@@ -1,6 +1,13 @@
 # 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.62 2006/02/06 13:55:55 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.63 2006/02/08 19:39:32 genstef Exp $
+
+*poppler-0.5.0-r5 (08 Feb 2006)
+
+  08 Feb 2006; Stefan Schweizer <genstef@gentoo.org>
+  +poppler-0.5.0-r5.ebuild:
+  Remove zlib because it is causing problems, see bug 122145 thanks to
+  Alexander Stein <alexander.stein@informatik.tu-chemnitz.de>
 
   06 Feb 2006; Mark Loeser <halcy0n@gentoo.org> poppler-0.5.0-r4.ebuild:
   Stable on x86; bug #120985
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 76a66649e8ec..bae085c6648f 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -1,15 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 653caed1209606541c75fc4f0d3a67a6 ChangeLog 8862
-RMD160 ed50fb3d288d7f2e226a5bad6d492cc5d69e136e ChangeLog 8862
-SHA256 d2c507fe84fc11978059542585302740b0a89de8bcc6b1b57fb9af0e484f8220 ChangeLog 8862
+MD5 f13971e1596f0ef7d5263392361c7385 ChangeLog 9110
+RMD160 f50f3e4ae426d4863423e7fe964bc10b580d0642 ChangeLog 9110
+SHA256 c0547ad1e86e868c3a0b0e656d3a9598a3ea622283495a6cc69aa2d73f726470 ChangeLog 9110
 MD5 91f251deb3a322d16a5ea68576f1c9a9 files/digest-poppler-0.4.3-r4 137
 RMD160 433f6cc961ec1aa027b262f4aed0a35cf801bc9b files/digest-poppler-0.4.3-r4 137
 SHA256 b61bc1efb297dc97a7615c8588eadc3a7bcbf1fe72d00af76053f4025b66e34d files/digest-poppler-0.4.3-r4 137
 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 3342aad1175b4b522f84e453999fbb05 files/poppler-0.4.1-cairo-ft.patch 470
 RMD160 f755975637edd27fa4d82c43d2789f489a45b8c8 files/poppler-0.4.1-cairo-ft.patch 470
 SHA256 e9ca00d0a991674199e5214556567e5ad895295bd63d72ce24bf0a6c3b9abb4e files/poppler-0.4.1-cairo-ft.patch 470
@@ -52,10 +52,6 @@ SHA256 e2db934f16109daf1e6a09fcf60f38451e8d56418ad9309e4fcf9a82feb29728 poppler-
 MD5 43b56695a38fc294f78cef0f9f38273d poppler-0.5.0-r4.ebuild 1681
 RMD160 12ce9e9da836105f30ee1f6a17e3a3e9bda268cb poppler-0.5.0-r4.ebuild 1681
 SHA256 eedc9ecf235eebce266bffc1b0a76d8e147ad9f3fe215d77c8df9dada57aaa77 poppler-0.5.0-r4.ebuild 1681
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFD51WtCRZPokWLroQRAtsQAKDN6wfiAL28uSWfKIFHYci/ZQw5GgCeKuAL
-G63ZKypVszsFpircKozo7zw=
-=91D5
------END PGP SIGNATURE-----
+MD5 7e8405e2938ff2f9e8581adedebb63bc poppler-0.5.0-r5.ebuild 1724
+RMD160 9eb4cd58be2400e6e2c8d80aa8a34ccfe00dfdaf poppler-0.5.0-r5.ebuild 1724
+SHA256 e01a7f5bd8534d6fae178869f922523dd2340227e32a1bab8fa1ae6083a80c87 poppler-0.5.0-r5.ebuild 1724
diff --git a/app-text/poppler/files/digest-poppler-0.5.0-r5 b/app-text/poppler/files/digest-poppler-0.5.0-r5
new file mode 100644
index 000000000000..ce2558469e43
--- /dev/null
+++ b/app-text/poppler/files/digest-poppler-0.5.0-r5
@@ -0,0 +1,3 @@
+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/poppler-0.5.0-r5.ebuild b/app-text/poppler/poppler-0.5.0-r5.ebuild
new file mode 100644
index 000000000000..a186c0a4c08d
--- /dev/null
+++ b/app-text/poppler/poppler-0.5.0-r5.ebuild
@@ -0,0 +1,60 @@
+# 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.1 2006/02/08 19:39:32 genstef Exp $
+
+inherit autotools eutils
+
+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
+	!<app-text/xpdf-3.01-r4
+	virtual/ghostscript"
+
+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() {
+	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
+}