summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Schweizer <genstef@gentoo.org>2006-10-04 19:18:49 +0000
committerStefan Schweizer <genstef@gentoo.org>2006-10-04 19:18:49 +0000
commit1123f6b28ef5ac58d8753f5725ede9f1ad87202f (patch)
tree2c12fc5ac596326f5d1815cce2a9bf2609b36343 /app-text
parentversion bump (diff)
downloadhistorical-1123f6b28ef5ac58d8753f5725ede9f1ad87202f.tar.gz
historical-1123f6b28ef5ac58d8753f5725ede9f1ad87202f.tar.bz2
historical-1123f6b28ef5ac58d8753f5725ede9f1ad87202f.zip
Use zlib again thanks to Francisco Javier <ffelix@sshinf.com> in bug 150086
Package-Manager: portage-2.1.2_pre2-r3
Diffstat (limited to 'app-text')
-rw-r--r--app-text/poppler/ChangeLog5
-rw-r--r--app-text/poppler/Manifest16
-rw-r--r--app-text/poppler/poppler-0.5.4.ebuild7
3 files changed, 15 insertions, 13 deletions
diff --git a/app-text/poppler/ChangeLog b/app-text/poppler/ChangeLog
index 37c75c5fff17..9bdb2014907a 100644
--- a/app-text/poppler/ChangeLog
+++ b/app-text/poppler/ChangeLog
@@ -1,6 +1,9 @@
# 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.104 2006/09/23 09:23:47 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.105 2006/10/04 19:18:49 genstef Exp $
+
+ 04 Oct 2006; Stefan Schweizer <genstef@gentoo.org> poppler-0.5.4.ebuild:
+ Use zlib again thanks to Francisco Javier <ffelix@sshinf.com> in bug 150086
23 Sep 2006; Stefan Schweizer <genstef@gentoo.org>
-files/poppler-0.4.3-pdf2xml.patch, -files/poppler-0.4.4-bug117481.patch,
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 9749d4ba4aa4..b7be1a5635e9 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -10,14 +10,14 @@ EBUILD poppler-0.5.3.ebuild 1439 RMD160 e9781cfa89726a78ec4c3c214631adef54cfba9c
MD5 901b740536537596acf3ec683a6ce599 poppler-0.5.3.ebuild 1439
RMD160 e9781cfa89726a78ec4c3c214631adef54cfba9c poppler-0.5.3.ebuild 1439
SHA256 e13f02b5b9d9c4ccf0f32f349e0064f3140ccfc1a4f9eb41c51790bece2a5042 poppler-0.5.3.ebuild 1439
-EBUILD poppler-0.5.4.ebuild 1487 RMD160 4aff2992955e9adca085e451073c3f607731327f SHA1 d352ec2ce6c174a2351f57febbc21b2510bbd936 SHA256 a8d59b7e893d9711e1c10eeeb1cc4fe85fe0feef7985e98be3b396d46278f745
-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 14294 RMD160 46602c2213ad8782be5be519ad0e216605dbbcd9 SHA1 07aad3dc35cfae6023a2c7a866ee7f451f03d714 SHA256 d214b45ef96fc8f3b6c8191fd80da4dfd7d4a8fb88bca552658ac13a176b85b1
-MD5 e8fb1757e9a3f532fbce971ea9043460 ChangeLog 14294
-RMD160 46602c2213ad8782be5be519ad0e216605dbbcd9 ChangeLog 14294
-SHA256 d214b45ef96fc8f3b6c8191fd80da4dfd7d4a8fb88bca552658ac13a176b85b1 ChangeLog 14294
+EBUILD poppler-0.5.4.ebuild 1426 RMD160 d7c1191ff4cd093c84f772ad318321bfe54c1fe3 SHA1 8377201a14b19790be84d08828597071f5827fa0 SHA256 6ca03a97685d050d104bf370b0e3e65da588f3bc28218a0376912ae83d7c63e0
+MD5 aa283908df1b38144cfff2ddd2cea8c7 poppler-0.5.4.ebuild 1426
+RMD160 d7c1191ff4cd093c84f772ad318321bfe54c1fe3 poppler-0.5.4.ebuild 1426
+SHA256 6ca03a97685d050d104bf370b0e3e65da588f3bc28218a0376912ae83d7c63e0 poppler-0.5.4.ebuild 1426
+MISC ChangeLog 14448 RMD160 702dbf2cb96315ad3402092b9a576cfc4793ff1d SHA1 d8cdeb45ee7c26e277f183a0175dd02d1e2ff895 SHA256 fefc0ef83c110f8bd64848460177be754a23776d708dd42b23e42fccb0c5beb1
+MD5 f37e2298201d9c7a0321f1922cfa6c0e ChangeLog 14448
+RMD160 702dbf2cb96315ad3402092b9a576cfc4793ff1d ChangeLog 14448
+SHA256 fefc0ef83c110f8bd64848460177be754a23776d708dd42b23e42fccb0c5beb1 ChangeLog 14448
MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 metadata.xml 161
diff --git a/app-text/poppler/poppler-0.5.4.ebuild b/app-text/poppler/poppler-0.5.4.ebuild
index e9bcd9f7faa4..70ff958e8c13 100644
--- a/app-text/poppler/poppler-0.5.4.ebuild
+++ b/app-text/poppler/poppler-0.5.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.5.4.ebuild,v 1.1 2006/09/23 09:20:50 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.5.4.ebuild,v 1.2 2006/10/04 19:18:49 genstef Exp $
inherit flag-o-matic eutils libtool
@@ -11,7 +11,7 @@ SRC_URI="http://poppler.freedesktop.org/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="cjk jpeg"
+IUSE="cjk jpeg zlib"
RDEPEND=">=media-libs/freetype-2.1.8
media-libs/fontconfig
@@ -39,9 +39,8 @@ src_compile() {
--disable-cairo-output \
--enable-xpdf-headers \
$(use_enable jpeg libjpeg) \
+ $(use_enable zlib) \
|| die "configuration failed"
- # $(use_enable zlib) breaks, see
- # https://bugs.freedesktop.org/show_bug.cgi?id=3948
emake || die "compilation failed"
}