summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandre Buisse <nattfodd@gentoo.org>2006-01-08 22:01:29 +0000
committerAlexandre Buisse <nattfodd@gentoo.org>2006-01-08 22:01:29 +0000
commit715baf3d84661da6b6849fa430840623919afc30 (patch)
treec566eeb08b45134a1f64b6fd71232a17788ef935 /app-text/pdftohtml
parentAdd fix for calendar crash. Bug #86174 (diff)
downloadgentoo-2-715baf3d84661da6b6849fa430840623919afc30.tar.gz
gentoo-2-715baf3d84661da6b6849fa430840623919afc30.tar.bz2
gentoo-2-715baf3d84661da6b6849fa430840623919afc30.zip
Block poppler which also installs pdftohtml (bug #117839).
(Portage version: 2.1_pre3-r1)
Diffstat (limited to 'app-text/pdftohtml')
-rw-r--r--app-text/pdftohtml/ChangeLog8
-rw-r--r--app-text/pdftohtml/Manifest6
-rw-r--r--app-text/pdftohtml/pdftohtml-0.36-r3.ebuild8
-rw-r--r--app-text/pdftohtml/pdftohtml-0.36-r4.ebuild8
4 files changed, 19 insertions, 11 deletions
diff --git a/app-text/pdftohtml/ChangeLog b/app-text/pdftohtml/ChangeLog
index a49825dba62f..28735f15af40 100644
--- a/app-text/pdftohtml/ChangeLog
+++ b/app-text/pdftohtml/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-text/pdftohtml
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/pdftohtml/ChangeLog,v 1.32 2005/12/12 08:49:59 robbat2 Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/pdftohtml/ChangeLog,v 1.33 2006/01/08 22:01:29 nattfodd Exp $
+
+ 08 Jan 2006; Alexandre Buisse <nattfodd@gentoo.org>
+ pdftohtml-0.36-r3.ebuild, pdftohtml-0.36-r4.ebuild:
+ Block poppler which also installs pdftohtml (bug #117839).
12 Dec 2005; Robin H. Johnson <robbat2@gentoo.org> metadata.xml:
Update metadata.xml.
diff --git a/app-text/pdftohtml/Manifest b/app-text/pdftohtml/Manifest
index d736353481fc..6ce8e1354dc3 100644
--- a/app-text/pdftohtml/Manifest
+++ b/app-text/pdftohtml/Manifest
@@ -1,4 +1,4 @@
-MD5 588157a532f2b31bac611222ef107397 ChangeLog 3952
+MD5 f458541743c21f2912cf278cb1f90b58 ChangeLog 4122
MD5 89167430147d99e86ca445b23be50f1b files/digest-pdftohtml-0.36-r3 66
MD5 89167430147d99e86ca445b23be50f1b files/digest-pdftohtml-0.36-r4 66
MD5 92812f06661bb78ab112d9f8ff6c7b73 files/pdftohtml-0.36-CAN-2005-3193.patch 2644
@@ -8,5 +8,5 @@ MD5 87d20c86d1451638e4b7adc2f7ac8067 files/xpdf-CESA-2004-007-xpdf2-newer.diff 2
MD5 2fce5bedd61300fad1566a41f991a782 files/xpdf-goo-sizet.patch 1424
MD5 362296e34a1a04a6e5e2a7d9e97547c6 files/xpdf2-underflow.patch 2363
MD5 970c0d92252dd03d92e70f4d0185533f metadata.xml 224
-MD5 c3ea476e8346bf07ac0a594403a13f63 pdftohtml-0.36-r3.ebuild 1198
-MD5 bf3c64b1c953230f94b7526fe2711b0b pdftohtml-0.36-r4.ebuild 1267
+MD5 0e4be2e8c99cdd72c2ed8a381d239c5e pdftohtml-0.36-r3.ebuild 1220
+MD5 8c1124ca1792f8be8583faa7790fdf7a pdftohtml-0.36-r4.ebuild 1289
diff --git a/app-text/pdftohtml/pdftohtml-0.36-r3.ebuild b/app-text/pdftohtml/pdftohtml-0.36-r3.ebuild
index ee49f37ed44a..24d03c17b6df 100644
--- a/app-text/pdftohtml/pdftohtml-0.36-r3.ebuild
+++ b/app-text/pdftohtml/pdftohtml-0.36-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/pdftohtml/pdftohtml-0.36-r3.ebuild,v 1.8 2005/10/29 14:14:46 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/pdftohtml/pdftohtml-0.36-r3.ebuild,v 1.9 2006/01/08 22:01:29 nattfodd Exp $
inherit eutils
@@ -11,7 +11,9 @@ LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ppc ~ppc-macos ppc64 sparc x86"
IUSE=""
-DEPEND="virtual/libc sys-devel/gcc"
+DEPEND="virtual/libc
+ sys-devel/gcc
+ !app-text/poppler"
RDEPEND="virtual/libc"
src_unpack() {
diff --git a/app-text/pdftohtml/pdftohtml-0.36-r4.ebuild b/app-text/pdftohtml/pdftohtml-0.36-r4.ebuild
index 8fc04d10451e..133b65784021 100644
--- a/app-text/pdftohtml/pdftohtml-0.36-r4.ebuild
+++ b/app-text/pdftohtml/pdftohtml-0.36-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/pdftohtml/pdftohtml-0.36-r4.ebuild,v 1.6 2005/12/07 13:18:21 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/pdftohtml/pdftohtml-0.36-r4.ebuild,v 1.7 2006/01/08 22:01:29 nattfodd Exp $
inherit eutils
@@ -11,7 +11,9 @@ LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ppc ~ppc-macos ppc64 sparc x86"
IUSE=""
-DEPEND="virtual/libc sys-devel/gcc"
+DEPEND="virtual/libc
+ sys-devel/gcc
+ !app-text/poppler"
RDEPEND="virtual/libc"
src_unpack() {