Add cairo flag back, now cairo is out of mask

Package-Manager: portage-2.0.53_rc6

diff --git a/app-text/poppler/ChangeLog b/app-text/poppler/ChangeLog
index 71e8095d54303f99ca920fea13809a35d3f637d4..b16f38a51b33a1061c2fe2e92b83e1c9bbab76ba 100644 (file)
--- a/app-text/poppler/ChangeLog
+++ b/app-text/poppler/ChangeLog
@@ -1,6 +1,9 @@
 # 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.14 2005/09/28 15:12:04 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.15 2005/10/31 16:39:50 dang Exp $
+
+  31 Oct 2005; <dang@gentoo.org> poppler-0.4.2.ebuild:
+  Add cairo flag back, now cairo is out of mask
 
 *poppler-0.4.2 (28 Sep 2005)
 

diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index f7c2512a8914bc0b886cfd5836ca189a6fa49d8e..72585b7b0c7f3f16fa4afd50dafde37e2217b264 100644 (file)
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -1,23 +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 c2a39769b0ada07dabb9f33344bb5557 ChangeLog 1854
-MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
-MD5 a7a442b7ddc6f73836d04408238326b1 poppler-0.4.2.ebuild 1320
-MD5 3342aad1175b4b522f84e453999fbb05 files/poppler-0.4.1-cairo-ft.patch 470
+MD5 115fe1e5686e2023e19e628dccbb5ec0 ChangeLog 1958
 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
 MD5 be62fc9641cde65e89b62b2a629bb617 files/digest-poppler-0.4.2 65
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDOrLeomPajV0RnrERAsxhAJ4pVHREqlay0Oc8CArgJCTZlM8wygCfbO3F
-QiYo1H4m7o6t5s+2LWJSCSs=
-=sID3
------END PGP SIGNATURE-----
+MD5 3342aad1175b4b522f84e453999fbb05 files/poppler-0.4.1-cairo-ft.patch 470
+MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
+MD5 2775f0555069e7375c82e6898951cc98 poppler-0.3.0.ebuild 860
+MD5 0f47305adf0da4f94dc6ef03291cd175 poppler-0.3.2.ebuild 941
+MD5 d2c3a8a3ea5a2609eaf2289b3995dea4 poppler-0.3.3.ebuild 939
+MD5 d7a0327f479e0afd0bd13cd6cbf00f89 poppler-0.4.1.ebuild 1073
+MD5 ba437d3c7fdbe0399796ca89227c573c poppler-0.4.2.ebuild 1342

diff --git a/app-text/poppler/poppler-0.4.2.ebuild b/app-text/poppler/poppler-0.4.2.ebuild
index 6fa4d97bf3e7558f0476bc4533f03c412be97c6c..a546284bc2411c6b270e862003a785d5ce4a0d84 100644 (file)
--- a/app-text/poppler/poppler-0.4.2.ebuild
+++ b/app-text/poppler/poppler-0.4.2.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.4.2.ebuild,v 1.2 2005/10/31 16:39:50 dang Exp $
 
 inherit eutils autotools
 
@@ -11,12 +11,12 @@ 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
+IUSE="gtk jpeg qt zlib cairo"
 
 RDEPEND=">=media-libs/freetype-2.1.8
        media-libs/fontconfig
        virtual/ghostscript
+       cairo? ( >=x11-libs/cairo-0.5 )
        gtk? ( >=x11-libs/gtk+-2.4 )
        qt? ( =x11-libs/qt-3* )
        jpeg? ( >=media-libs/jpeg-6b )
@@ -35,7 +35,7 @@ src_unpack(){
 
 src_compile() {
        econf --disable-poppler-qt4 --enable-opi \
-               --disable-cairo-output \
+               $(use_enable cairo cairo-output) \
                $(use_enable jpeg libjpeg) \
                $(use_enable zlib) \
                $(use_enable gtk poppler-glib) \