diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2006-01-12 21:33:04 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2006-01-12 21:33:04 +0000 |
| commit | 6c2bdb7baf66e95e7adcdf5208aba9e9ad595198 (patch) | |
| tree | 596137ad662ad47908a0e97f1d47f7aaaa4522e2 /app-text/poppler | |
| parent | Added libgeier to the package. Necessary for app-office/taxbird (diff) | |
| download | gentoo-2-6c2bdb7baf66e95e7adcdf5208aba9e9ad595198.tar.gz gentoo-2-6c2bdb7baf66e95e7adcdf5208aba9e9ad595198.tar.bz2 gentoo-2-6c2bdb7baf66e95e7adcdf5208aba9e9ad595198.zip | |
pdf2html != pdftohtml. pdftohtml conflicts with poppler, pdf2html does not.
(Portage version: 2.1_pre3-r1)
Diffstat (limited to 'app-text/poppler')
| -rw-r--r-- | app-text/poppler/ChangeLog | 6 | ||||
| -rw-r--r-- | app-text/poppler/poppler-0.4.3-r4.ebuild | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/app-text/poppler/ChangeLog b/app-text/poppler/ChangeLog index 97abe2087bc7..416920aac2f8 100644 --- a/app-text/poppler/ChangeLog +++ b/app-text/poppler/ChangeLog @@ -1,6 +1,10 @@ # 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.42 2006/01/12 14:18:16 blubb Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.43 2006/01/12 21:33:04 robbat2 Exp $ + + 12 Jan 2006; Robin H. Johnson <robbat2@gentoo.org> + poppler-0.4.3-r4.ebuild: + pdf2html != pdftohtml. pdftohtml conflicts with poppler, pdf2html does not. 12 Jan 2006; Simon Stelling <blubb@gentoo.org> poppler-0.4.3-r4.ebuild: stable on amd64 wrt bug 117495 diff --git a/app-text/poppler/poppler-0.4.3-r4.ebuild b/app-text/poppler/poppler-0.4.3-r4.ebuild index 5c78442ff11e..4f922ccfb1db 100644 --- a/app-text/poppler/poppler-0.4.3-r4.ebuild +++ b/app-text/poppler/poppler-0.4.3-r4.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.4.3-r4.ebuild,v 1.9 2006/01/12 14:18:16 blubb Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.4.3-r4.ebuild,v 1.10 2006/01/12 21:33:04 robbat2 Exp $ inherit eutils autotools @@ -20,7 +20,7 @@ RDEPEND=">=media-libs/freetype-2.1.8 cairo? ( >=x11-libs/cairo-0.5 ) jpeg? ( >=media-libs/jpeg-6b ) zlib? ( sys-libs/zlib ) - !app-text/pdf2html + !app-text/pdftohtml !<app-text/xpdf-3.01-r4" DEPEND="${RDEPEND} |