Update so we either use the superior cairo backend or a stripped-down poppler-glib, using neither cairo, gdk or gdk-pixbuf, only splash.

Package-Manager: portage-2.2_rc28/cvs/Linux x86_64

3 files changed, 30 insertions, 7 deletions

diff --git a/dev-libs/poppler-glib/ChangeLog b/dev-libs/poppler-glib/ChangeLog
index 61fbe03479b3..3812d00b2424 100644
--- a/dev-libs/poppler-glib/ChangeLog
+++ b/dev-libs/poppler-glib/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/poppler-glib
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/poppler-glib/ChangeLog,v 1.1 2009/04/01 14:44:00 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/poppler-glib/ChangeLog,v 1.2 2009/04/10 23:20:57 loki_val Exp $
+
+  10 Apr 2009; Peter Alfredsen <loki_val@gentoo.org>
+  poppler-glib-0.10.5.ebuild:
+  Update so we either use the superior cairo backend or a stripped-down
+  poppler-glib, using neither cairo, gdk or gdk-pixbuf, only splash.
 
 *poppler-glib-0.10.5 (01 Apr 2009)
 
diff --git a/dev-libs/poppler-glib/Manifest b/dev-libs/poppler-glib/Manifest
index 4a289d683925..4bf708703874 100644
--- a/dev-libs/poppler-glib/Manifest
+++ b/dev-libs/poppler-glib/Manifest
@@ -1,4 +1,4 @@
 DIST poppler-0.10.5.tar.gz 1516687 RMD160 73e2330c2c874fb58f95c39fcdb5421766b6742c SHA1 720b79adbeb6e7b722d3f0f61e165b9310fe61fc SHA256 cfd4115f787cac7f0f673be48e95c645a323dc5b6b756280e47e28faa5d98d92
-EBUILD poppler-glib-0.10.5.ebuild 988 RMD160 60a34b51350b37380dda4bffbbc87f23ce999595 SHA1 dac327e6eca0c922961e6f924b9829479cf3f2f7 SHA256 bf786f58ea242f31c3993713a85688338b3ca06e77e0e7f5d6fb141cea580ba9
-MISC ChangeLog 399 RMD160 a6aedf2a650f90c874487cb3470856e37d13a5de SHA1 2cbd4119033aacde91ad53e49e6426c0e7fec7fb SHA256 6501c7969dd536a0fa0ad1469dbaf6e3fddb32da2cf1bbae675784da6d5534a3
+EBUILD poppler-glib-0.10.5.ebuild 1804 RMD160 03062f42f9d6aac8b6a42eb6f3cc13ca7bd98288 SHA1 26b35f46c7ec62d3fa897ec33a6b056b480a91e7 SHA256 604aa4baa539c2a9541d1e75f90b257c8d7d91104bbadf52018b2c5b327f1fd0
+MISC ChangeLog 624 RMD160 7fdc5755fc646fc8e1636c396bff9573b5a60f0d SHA1 ed3251d5df249335bc85297ad69636e8de3f90b3 SHA256 4c304b78b0d0bf9309ee6908b99836dc40e8866441530ea01c65243f377e04a8
 MISC metadata.xml 254 RMD160 e2af7df96e23f1a8f34c041859efe8d5b23ac7f0 SHA1 6d81483a9e1e502e7ee60b758f8136cc61a4af8e SHA256 14288b420c7d20adb5f3c4d70b643d0b9436e3aaadcbbdea199b119480b1e617
diff --git a/dev-libs/poppler-glib/poppler-glib-0.10.5.ebuild b/dev-libs/poppler-glib/poppler-glib-0.10.5.ebuild
index 359c8f36c2d8..6f1c0909e625 100644
--- a/dev-libs/poppler-glib/poppler-glib-0.10.5.ebuild
+++ b/dev-libs/poppler-glib/poppler-glib-0.10.5.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/poppler-glib/poppler-glib-0.10.5.ebuild,v 1.1 2009/04/01 14:44:00 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/poppler-glib/poppler-glib-0.10.5.ebuild,v 1.2 2009/04/10 23:20:57 loki_val Exp $
 
 EAPI=2
 
 POPPLER_MODULE=glib
 
-inherit poppler
+inherit poppler flag-o-matic
 
 DESCRIPTION="Glib bindings for poppler"
 
@@ -15,10 +15,23 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="+cairo"
 
+# The Cairo renderer represents a superset of the splash renderer.
+# We could also have a gtk use-flag for the interface to gdk-pixbuf, but that wouldn't
+# make sense for us, because:
+# 1. Every app that is ok with only [cairo] is already depending on gtk+:2 :
+#	media-gfx/inkscape
+#	app-text/evince
+# 2. Cairo is a dependency of gtk+:2
+# 3. gdk and gdk-pixbuf is the old way of doing things. Everybody is hot for cairo.
+# 4. In fact, the only app that's ok with [-cairo,-gtk] is app-misc/tracker.
+
 RDEPEND="
 	~dev-libs/poppler-${PV}
 	>=dev-libs/glib-2.16
-	cairo? ( >=x11-libs/cairo-1.4 )
+	cairo? (
+		>=x11-libs/cairo-1.8.2
+		>=x11-libs/gtk+-2.14.0:2
+	)
 	"
 DEPEND="
 	${RDEPEND}
@@ -26,8 +39,12 @@ DEPEND="
 	"
 
 pkg_setup() {
-	POPPLER_CONF="$(use_enable cairo cairo-output)"
+	POPPLER_CONF="$(use_enable cairo cairo-output) $(use_enable cairo gdk) $(use_enable cairo splash-output)"
 	POPPLER_PKGCONFIG=( poppler-glib.pc cairo=poppler-cairo.pc )
+	if ! use cairo
+	then
+		export CPPFLAGS="${CPPFLAGS} -DHAVE_SPLASH" poppler_src_compile
+	fi
 }
 
 src_prepare() {
@@ -36,6 +53,7 @@ src_prepare() {
 		-e 's:reference::'	\
 		-e 's:demo::'		\
 		glib/Makefile.in || die "Fixing glib Makefile.in failed"
+	use cairo || { sed -i -e 's:gdk-2.0 gdk-pixbuf-2.0 ::' poppler-glib.pc.in || die "Sedding poppler-glib.pc.in failed" ; }
 }
 
 src_compile() {