Fix -cairo glib compilation thanks Denny Reeh <denny.reeh@gmail.com> in bug 191298

Package-Manager: portage-2.1.3.7

9 files changed, 213 insertions, 267 deletions

diff --git a/app-text/poppler-bindings/ChangeLog b/app-text/poppler-bindings/ChangeLog
index 42475b896c98..f67da32c2cd6 100644
--- a/app-text/poppler-bindings/ChangeLog
+++ b/app-text/poppler-bindings/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/poppler-bindings
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler-bindings/ChangeLog,v 1.68 2007/09/04 10:43:47 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler-bindings/ChangeLog,v 1.69 2007/09/06 17:48:22 genstef Exp $
+
+  06 Sep 2007; Stefan Schweizer <genstef@gentoo.org>
+  -files/poppler-0.5.9-bindings.patch, +files/poppler-nocairo.patch,
+  -poppler-bindings-0.5.9.ebuild, -poppler-bindings-0.5.91.ebuild,
+  poppler-bindings-0.6.ebuild:
+  Fix -cairo glib compilation thanks Denny Reeh <denny.reeh@gmail.com> in bug
+  191298
 
   04 Sep 2007; Stefan Schweizer <genstef@gentoo.org>
   +files/poppler-0.6-bindings.patch:
diff --git a/app-text/poppler-bindings/Manifest b/app-text/poppler-bindings/Manifest
index 5e67f1dc9f0a..89bd58bd09d8 100644
--- a/app-text/poppler-bindings/Manifest
+++ b/app-text/poppler-bindings/Manifest
@@ -6,18 +6,16 @@ AUX poppler-0.5.2-bindings.patch 2981 RMD160 3cd602de04e21b16ad2d72e43ac497f2096
 MD5 fd7f0254cdc14aa17e517b17c4500d15 files/poppler-0.5.2-bindings.patch 2981
 RMD160 3cd602de04e21b16ad2d72e43ac497f2096e9407 files/poppler-0.5.2-bindings.patch 2981
 SHA256 fddf8730871743ca6bb3cf210f9444b7b5de4704d68b383ddc982ef9e2ff9ffc files/poppler-0.5.2-bindings.patch 2981
-AUX poppler-0.5.9-bindings.patch 3054 RMD160 bcf7519ed57111d5def87857dce2249b282ff67b SHA1 a300c2dfa43e687ce3a674fbbaf80b67706eac37 SHA256 958aca4607713a7d58db40461995e0a869a8b48e3c425e76b19b183965a4aa50
-MD5 a33645793c2942d9cc014b50cd9282d6 files/poppler-0.5.9-bindings.patch 3054
-RMD160 bcf7519ed57111d5def87857dce2249b282ff67b files/poppler-0.5.9-bindings.patch 3054
-SHA256 958aca4607713a7d58db40461995e0a869a8b48e3c425e76b19b183965a4aa50 files/poppler-0.5.9-bindings.patch 3054
 AUX poppler-0.6-bindings.patch 4980 RMD160 8e2953d6dd3612d1fa5aaedd373bf0b1b90043c4 SHA1 9525ef7dffdf993035d8a33a3851e1dbca200dad SHA256 03ee71d16535b8c58acec513401435af12a6179e4e0d0b7e11b700b80ceff7f6
 MD5 88467fd38cc5a550ea8035bcc3a9f729 files/poppler-0.6-bindings.patch 4980
 RMD160 8e2953d6dd3612d1fa5aaedd373bf0b1b90043c4 files/poppler-0.6-bindings.patch 4980
 SHA256 03ee71d16535b8c58acec513401435af12a6179e4e0d0b7e11b700b80ceff7f6 files/poppler-0.6-bindings.patch 4980
+AUX poppler-nocairo.patch 4770 RMD160 6daf746989f04bd5f5d3bb0c48994ca9fa807310 SHA1 d8eaf90e5bab5a2bb5990ffbdf2940da8c4ab0fd SHA256 a83b4602e877a07f3d83410068208886ed3e90ba0fa044548bee6af48948fe5e
+MD5 75d227b52f661fddcd345e90d43d07ab files/poppler-nocairo.patch 4770
+RMD160 6daf746989f04bd5f5d3bb0c48994ca9fa807310 files/poppler-nocairo.patch 4770
+SHA256 a83b4602e877a07f3d83410068208886ed3e90ba0fa044548bee6af48948fe5e files/poppler-nocairo.patch 4770
 DIST poppler-0.5.3.tar.gz 1049900 RMD160 3456de23955fc4001842c76d32deba308bd7f968 SHA1 e197f5cf56f0676b5ca313577dd6456a393c46ec SHA256 5cfabff39670610fa8f5c33da7b9b0ae89d445445be6d6c245cdce8bf3f24190
 DIST poppler-0.5.4.tar.gz 1062401 RMD160 f28c89b03388757067505df3c60a1d878626b0dd SHA1 edf4e4ff17ef86a7f60f097949ad7db53fa2c3b1 SHA256 ca0f880a4ff07391e99b443f0e7c9860241df6a6aaa327b9d811b358d94a29c9
-DIST poppler-0.5.9.tar.gz 1169002 RMD160 3aab75dfb1f4226048c23ed9b6f08fdb2608feb1 SHA1 8053ede1d7e3d30a3dd934b4d8738334f966004e SHA256 bee251e5149ac9dd8824aac316456b78a82f4e1954eb3c1a94db3625340ef61e
-DIST poppler-0.5.91.tar.gz 1184826 RMD160 fa4d68efde6d0f4c14fff2d1f986c7c64275f8af SHA1 fe00e38db0d900e13e688a663c1ea3152cabae02 SHA256 4e046b243c2a322008aa2dd7ed09e39d6b2e183482d09486873735031c30b888
 DIST poppler-0.6.tar.gz 1228142 RMD160 ebdb3d0a38a573dfa2da52949225461dfa882aa9 SHA1 a40abb17b912d6ecd0e4ece609b74647b8d04279 SHA256 ef4bb8fd1bb4dffd5dc689509bf3e33260774550425ee78995a8d0297f76bfae
 DIST poppler-test-0.5.3.tar.gz 1794929 RMD160 a26e98259d94934dc4f0386e781cb3465c2bf788 SHA1 a316a6598687e303779cc8f4307ccf35b36c9f58 SHA256 02ed7736bde82a3f70440b947bfe43bb87efbea653dfebac53f47af390c1b5ec
 EBUILD poppler-bindings-0.5.3.ebuild 1800 RMD160 aaa467b8960270dfcf3aa78a0b5c1f148c1409fb SHA1 825eeb6fd92d29d8fab9654d06630b66b25405fe SHA256 f06c2df15070e6bc258d7ce8e7802b2e8c804c05b9b4faf3920c840528ff851e
@@ -28,22 +26,14 @@ EBUILD poppler-bindings-0.5.4.ebuild 1814 RMD160 075c8e04d914681ca9702c2286f8393
 MD5 34153bfdeaf3ed8be4c9d4f4f4d9d183 poppler-bindings-0.5.4.ebuild 1814
 RMD160 075c8e04d914681ca9702c2286f8393a046a6767 poppler-bindings-0.5.4.ebuild 1814
 SHA256 9d2fe71e7cddfe0a5276ad0234c8b706dfd27ed6f97fe05af39c0ea4e8b72301 poppler-bindings-0.5.4.ebuild 1814
-EBUILD poppler-bindings-0.5.9.ebuild 1735 RMD160 d64f955206c7e99e4a9a0a8142e7d1b940a881aa SHA1 5610a038266c2046cf2f11f0af60c88374c7bd49 SHA256 eb4869fd3924c24990c99dbb66b8fbaa0c506de274340c0272742024de49d0ac
-MD5 e44df9d7422a13b595c82b322227fb9a poppler-bindings-0.5.9.ebuild 1735
-RMD160 d64f955206c7e99e4a9a0a8142e7d1b940a881aa poppler-bindings-0.5.9.ebuild 1735
-SHA256 eb4869fd3924c24990c99dbb66b8fbaa0c506de274340c0272742024de49d0ac poppler-bindings-0.5.9.ebuild 1735
-EBUILD poppler-bindings-0.5.91.ebuild 1736 RMD160 da9c3ad2ef1aea813dbf348cf8ad5984345969ae SHA1 a850c76a403b7d9314f48f3a416332912b9b482a SHA256 b8d7d6612905c0863b1f8804fe10e7c15ef64ab76dbe13f8212e1e8e0387827d
-MD5 ae1be43bd2ee1769746ba4b17644af74 poppler-bindings-0.5.91.ebuild 1736
-RMD160 da9c3ad2ef1aea813dbf348cf8ad5984345969ae poppler-bindings-0.5.91.ebuild 1736
-SHA256 b8d7d6612905c0863b1f8804fe10e7c15ef64ab76dbe13f8212e1e8e0387827d poppler-bindings-0.5.91.ebuild 1736
-EBUILD poppler-bindings-0.6.ebuild 1731 RMD160 e4abfc54483282d3eb1ccb87ea3253e49c69ed2a SHA1 d9a70b812ce6560660091ae5afff3fac351f1a0b SHA256 4d73b59fff0b45ef924831efb13de830d7b66924ecefde4e79c3510d4c0b06fb
-MD5 f8e7e62addf7b6541b5302495d282b80 poppler-bindings-0.6.ebuild 1731
-RMD160 e4abfc54483282d3eb1ccb87ea3253e49c69ed2a poppler-bindings-0.6.ebuild 1731
-SHA256 4d73b59fff0b45ef924831efb13de830d7b66924ecefde4e79c3510d4c0b06fb poppler-bindings-0.6.ebuild 1731
-MISC ChangeLog 10038 RMD160 637a6393fbe763417a3b74454f4d8533a3dd9f47 SHA1 0b95765145d4adadebccbf64eba140fe43304e67 SHA256 f9b66fb19d04866a5c5f74eab5771fe430923d7304a248c9a490eb20fb1a6ec6
-MD5 799c23120973bb3afe2c2afae7147007 ChangeLog 10038
-RMD160 637a6393fbe763417a3b74454f4d8533a3dd9f47 ChangeLog 10038
-SHA256 f9b66fb19d04866a5c5f74eab5771fe430923d7304a248c9a490eb20fb1a6ec6 ChangeLog 10038
+EBUILD poppler-bindings-0.6.ebuild 1775 RMD160 cd31f4d692a7c5002a67d0816ec01f010238a745 SHA1 15ec89f6309b8df55098bafddc08442912e85b52 SHA256 289a2520b65428f4e87ece068cedcabe024b30ea0e76fd523ea6b6176f927725
+MD5 7d6c7e074a7071ccbbefe7153b4d8f30 poppler-bindings-0.6.ebuild 1775
+RMD160 cd31f4d692a7c5002a67d0816ec01f010238a745 poppler-bindings-0.6.ebuild 1775
+SHA256 289a2520b65428f4e87ece068cedcabe024b30ea0e76fd523ea6b6176f927725 poppler-bindings-0.6.ebuild 1775
+MISC ChangeLog 10346 RMD160 f0d6563d43baa42f550eacb0c2152fea7313f3c3 SHA1 7781868e1d1b97e2ca90835f416f7e4fd1633036 SHA256 cf74a0951350dd1d58b169940feefbf2f863f3ad543cb0f598ead986067007e2
+MD5 458a6c7a6d1a06c08d07c68213e8ca74 ChangeLog 10346
+RMD160 f0d6563d43baa42f550eacb0c2152fea7313f3c3 ChangeLog 10346
+SHA256 cf74a0951350dd1d58b169940feefbf2f863f3ad543cb0f598ead986067007e2 ChangeLog 10346
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 metadata.xml 161
@@ -54,12 +44,6 @@ SHA256 8a6fce077ac04253b966f047c5ab85bdaca74a1c3c91af643edd5210f01b150d files/di
 MD5 ecccdf34b180ec56d723065e603fba18 files/digest-poppler-bindings-0.5.4 503
 RMD160 e65805eae3add99dd9d07a6012fd6c5070977221 files/digest-poppler-bindings-0.5.4 503
 SHA256 08ddeb82cca3c38dd49b940ca14b9b188c8dd79b122a3c8d2880b278fd2383b3 files/digest-poppler-bindings-0.5.4 503
-MD5 e86666f32aad9ab69642e968318e0fe3 files/digest-poppler-bindings-0.5.9 244
-RMD160 4df3072152cee76f0fe857a4303b1329fa76e292 files/digest-poppler-bindings-0.5.9 244
-SHA256 a6f8eeeffe559868d621659014edd8595b0f92e4f28369fc0504faf3651e0b41 files/digest-poppler-bindings-0.5.9 244
-MD5 58ece1379aacae148753e817dfbd7177 files/digest-poppler-bindings-0.5.91 247
-RMD160 82a7a9c8970cb3c1c544b96a03f45378d7f802ad files/digest-poppler-bindings-0.5.91 247
-SHA256 423f978a28d1486c85f4c1b477c67ba639f516566b9669740c918b43b17367e3 files/digest-poppler-bindings-0.5.91 247
 MD5 9d562560ec4fa0f59bf03cf4a5db1c40 files/digest-poppler-bindings-0.6 238
 RMD160 4cbbf991280550f2a1f959174379989b8f3542e2 files/digest-poppler-bindings-0.6 238
 SHA256 29759009d0c62ba82f973687c8ec106029e00ab15baed843cdfdeb1a83346562 files/digest-poppler-bindings-0.6 238
diff --git a/app-text/poppler-bindings/files/digest-poppler-bindings-0.5.9 b/app-text/poppler-bindings/files/digest-poppler-bindings-0.5.9
deleted file mode 100644
index 85ee4a6c1d4d..000000000000
--- a/app-text/poppler-bindings/files/digest-poppler-bindings-0.5.9
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 8d1ac008614c0e413bcac95b8102fa07 poppler-0.5.9.tar.gz 1169002
-RMD160 3aab75dfb1f4226048c23ed9b6f08fdb2608feb1 poppler-0.5.9.tar.gz 1169002
-SHA256 bee251e5149ac9dd8824aac316456b78a82f4e1954eb3c1a94db3625340ef61e poppler-0.5.9.tar.gz 1169002
diff --git a/app-text/poppler-bindings/files/digest-poppler-bindings-0.5.91 b/app-text/poppler-bindings/files/digest-poppler-bindings-0.5.91
deleted file mode 100644
index abefa4595d7f..000000000000
--- a/app-text/poppler-bindings/files/digest-poppler-bindings-0.5.91
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 0cc1b0f183b1559f10154bb57268c6e1 poppler-0.5.91.tar.gz 1184826
-RMD160 fa4d68efde6d0f4c14fff2d1f986c7c64275f8af poppler-0.5.91.tar.gz 1184826
-SHA256 4e046b243c2a322008aa2dd7ed09e39d6b2e183482d09486873735031c30b888 poppler-0.5.91.tar.gz 1184826
diff --git a/app-text/poppler-bindings/files/poppler-0.5.9-bindings.patch b/app-text/poppler-bindings/files/poppler-0.5.9-bindings.patch
deleted file mode 100644
index a45afc73fb4e..000000000000
--- a/app-text/poppler-bindings/files/poppler-0.5.9-bindings.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-diff -ur poppler-0.5.9.orig/glib/Makefile.am poppler-0.5.9/glib/Makefile.am
---- poppler-0.5.9.orig/glib/Makefile.am	2007-05-31 12:38:10.000000000 +0200
-+++ poppler-0.5.9/glib/Makefile.am	2007-05-31 12:38:17.000000000 +0200
-@@ -82,7 +82,7 @@
- 	poppler-private.h
- 
- libpoppler_glib_la_LIBADD =				\
--	$(top_builddir)/poppler/libpoppler.la		\
-+	-lpoppler					\
- 	$(POPPLER_GLIB_LIBS)				\
- 	$(FREETYPE_LIBS)				\
- 	$(FONTCONFIG_LIBS)				\
-@@ -96,7 +96,7 @@
-        test-poppler-glib.c
- 
- test_poppler_glib_LDADD =			\
--	$(top_builddir)/poppler/libpoppler.la	\
-+	-lpoppler				\
- 	libpoppler-glib.la			\
- 	$(POPPLER_GLIB_LIBS)			\
- 	$(FREETYPE_LIBS)			\
-Nur in poppler-0.5.9/glib: Makefile.am.orig.
-diff -ur poppler-0.5.9.orig/Makefile.am poppler-0.5.9/Makefile.am
---- poppler-0.5.9.orig/Makefile.am	2007-05-31 12:38:10.000000000 +0200
-+++ poppler-0.5.9/Makefile.am	2007-05-31 12:38:17.000000000 +0200
-@@ -29,7 +29,7 @@
- utils_subdir = utils
- endif
- 
--SUBDIRS = goo fofi $(splash_subdir) poppler $(utils_subdir) $(glib_subdir) $(qt_subdir) test $(qt4_subdir)
-+SUBDIRS = $(glib_subdir) $(qt_subdir) $(qt4_subdir)
- 
- EXTRA_DIST =					\
- 	README-XPDF				\
-@@ -40,9 +40,7 @@
- 
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA =				\
--	poppler.pc				\
- 	$(cairo_pc_file)			\
--	$(splash_pc_file)			\
- 	$(glib_pc_file)				\
- 	$(qt_pc_file)                           \
- 	$(qt4_pc_file)
-diff -ur poppler-0.5.9.orig/qt/Makefile.am poppler-0.5.9/qt/Makefile.am
---- poppler-0.5.9.orig/qt/Makefile.am	2007-05-31 12:38:10.000000000 +0200
-+++ poppler-0.5.9/qt/Makefile.am	2007-05-31 12:38:17.000000000 +0200
-@@ -24,7 +24,7 @@
- 	poppler-private.h
- 
- libpoppler_qt_la_LIBADD = 			\
--	$(top_builddir)/poppler/libpoppler.la	\
-+	-lpoppler				\
- 	$(POPPLER_QT_LIBS)			\
- 	$(FREETYPE_LIBS)			\
- 	$(FONTCONFIG_LIBS)
-@@ -41,7 +41,7 @@
-        test-poppler-qt.cpp
- 
- test_poppler_qt_LDADD =				\
--	$(top_builddir)/poppler/libpoppler.la	\
-+	-lpoppler				\
- 	libpoppler-qt.la			\
- 	$(POPPLER_QT_LIBS)			\
- 	$(FREETYPE_LIBS)
-Nur in poppler-0.5.9/qt: Makefile.am.orig.
-diff -ur poppler-0.5.9.orig/qt4/src/Makefile.am poppler-0.5.9/qt4/src/Makefile.am
---- poppler-0.5.9.orig/qt4/src/Makefile.am	2007-05-31 12:38:10.000000000 +0200
-+++ poppler-0.5.9/qt4/src/Makefile.am	2007-05-31 12:38:55.000000000 +0200
-@@ -35,7 +35,7 @@
- 	poppler-private.h
- 
- libpoppler_qt4_la_LIBADD = 			\
--	$(top_builddir)/poppler/libpoppler.la	\
-+	-lpoppler				\
- 	$(FONTCONFIG_LIBS)				\
- 	$(POPPLER_QT4_LIBS)
- 
-Nur in poppler-0.5.9/qt4/src: Makefile.am.orig.
-Nur in poppler-0.5.9/qt4/src: Makefile.am.rej.
-diff -ur poppler-0.5.9.orig/qt4/tests/Makefile.am poppler-0.5.9/qt4/tests/Makefile.am
---- poppler-0.5.9.orig/qt4/tests/Makefile.am	2007-05-31 12:38:10.000000000 +0200
-+++ poppler-0.5.9/qt4/tests/Makefile.am	2007-05-31 12:38:17.000000000 +0200
-@@ -7,7 +7,7 @@
- 	$(POPPLER_QT4_CFLAGS)
- 
- LDADDS =					\
--	$(top_builddir)/poppler/libpoppler.la	\
-+	-lpoppler				\
- 	$(top_builddir)/qt4/src/libpoppler-qt4.la	\
- 	$(FONTCONFIG_LIBS)				\
- 	$(POPPLER_QT4_LIBS)
-Nur in poppler-0.5.9/qt4/tests: Makefile.am.orig.
diff --git a/app-text/poppler-bindings/files/poppler-nocairo.patch b/app-text/poppler-bindings/files/poppler-nocairo.patch
new file mode 100644
index 000000000000..88add4fa73f8
--- /dev/null
+++ b/app-text/poppler-bindings/files/poppler-nocairo.patch
@@ -0,0 +1,191 @@
+--- glib/poppler-page.cc	2007/09/03 08:54:03	1.69
++++ glib/poppler-page.cc	2007/09/05 10:57:30	1.69.2.1
+@@ -581,10 +581,11 @@
+ #if defined (HAVE_CAIRO)
+ 
+ static void
+-poppler_page_set_selection_alpha (PopplerPage      *page,
+-				  double            scale,
+-				  GdkPixbuf        *pixbuf,
+-				  PopplerRectangle *selection)
++poppler_page_set_selection_alpha (PopplerPage           *page,
++				  double                 scale,
++				  GdkPixbuf             *pixbuf,
++				  PopplerSelectionStyle  style,
++				  PopplerRectangle      *selection)
+ {
+   /* Cairo doesn't need this, since cairo generates an alpha channel. */ 
+ }
+@@ -592,10 +593,11 @@
+ #elif defined (HAVE_SPLASH)
+ 
+ static void
+-poppler_page_set_selection_alpha (PopplerPage      *page,
+-				  double            scale,
+-				  GdkPixbuf        *pixbuf,
+-				  PopplerRectangle *selection)
++poppler_page_set_selection_alpha (PopplerPage           *page,
++				  double                 scale,
++				  GdkPixbuf             *pixbuf,
++				  PopplerSelectionStyle  style,
++				  PopplerRectangle      *selection)
+ {
+   GdkRegion *region;
+   gint n_rectangles, i, x, y, width, height;
+@@ -620,7 +622,7 @@
+       }
+   }
+ 
+-  region = poppler_page_get_selection_region (page, scale, selection);
++  region = poppler_page_get_selection_region (page, scale, style, selection);
+ 
+   gdk_region_get_rectangles (region, &rectangles, &n_rectangles);
+   for (i = 0; i < n_rectangles; i++) {
+@@ -803,7 +805,7 @@
+ 
+   poppler_page_copy_to_pixbuf (page, pixbuf, &data);
+ 
+-  poppler_page_set_selection_alpha (page, scale, pixbuf, selection);
++  poppler_page_set_selection_alpha (page, scale, pixbuf, style, selection);
+ 
+   /* We'll need a function to destroy page->text_dev and page->gfx
+    * when the application wants to get rid of them.
+--- glib/demo/render.c	2007/08/26 10:52:19	1.1
++++ glib/demo/render.c	2007/09/05 10:57:30	1.1.2.1
+@@ -16,13 +16,17 @@
+  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+  */
+ 
++#include "config.h"
++
+ #include <gtk/gtk.h>
+ #include <cairo.h>
+ 
+ #include "render.h"
+ 
+ typedef enum {
++#if defined (HAVE_CAIRO)
+ 	PGD_RENDER_CAIRO,
++#endif
+ 	PGD_RENDER_PIXBUF
+ } PgdRenderMode;
+ 
+@@ -43,8 +47,10 @@
+ 	GtkWidget       *slice_w;
+ 	GtkWidget       *slice_h;
+ 	GtkWidget       *timer_label;
+-
++	
++#if defined (HAVE_CAIRO)
+ 	cairo_surface_t *surface;
++#endif
+ 	GdkPixbuf       *pixbuf;
+ } PgdRenderDemo;
+ 
+@@ -58,11 +64,13 @@
+ 		g_object_unref (demo->doc);
+ 		demo->doc = NULL;
+ 	}
+-
++	
++#if defined (HAVE_CAIRO)
+ 	if (demo->surface) {
+ 		cairo_surface_destroy (demo->surface);
+ 		demo->surface = NULL;
+ 	}
++#endif
+ 
+ 	if (demo->pixbuf) {
+ 		g_object_unref (demo->pixbuf);
+@@ -77,13 +85,17 @@
+ 				GdkEventExpose *event,
+ 				PgdRenderDemo  *demo)
+ {
++#if defined (HAVE_CAIRO)
+ 	if (demo->mode == PGD_RENDER_CAIRO && !demo->surface)
+ 		return FALSE;
++#endif
++	
+ 	if (demo->mode == PGD_RENDER_PIXBUF && !demo->pixbuf)
+ 		return FALSE;
+ 
+ 	gdk_window_clear (area->window);
+ 
++#if defined (HAVE_CAIRO)
+ 	if (demo->mode == PGD_RENDER_CAIRO) {
+ 		cairo_t *cr;
+ 
+@@ -92,6 +104,7 @@
+ 		cairo_paint (cr);
+ 		cairo_destroy (cr);
+ 	} else if (demo->mode == PGD_RENDER_PIXBUF) {
++#endif
+ 		gdk_draw_pixbuf (area->window,
+ 				 area->style->fg_gc[GTK_STATE_NORMAL],
+ 				 demo->pixbuf,
+@@ -101,10 +114,12 @@
+ 				 gdk_pixbuf_get_height (demo->pixbuf),
+ 				 GDK_RGB_DITHER_NORMAL,
+ 				 0, 0);
++#if defined (HAVE_CAIRO)
+ 	} else {
+ 		g_assert_not_reached ();
+ 	}
+-
++#endif
++	
+ 	return TRUE;
+ }
+ 
+@@ -122,9 +137,12 @@
+ 	if (!page)
+ 		return;
+ 
++#if defined (HAVE_CAIRO)
+ 	if (demo->surface)
+ 		cairo_surface_destroy (demo->surface);
+ 	demo->surface = NULL;
++#endif
++	
+ 	if (demo->pixbuf)
+ 		g_object_unref (demo->pixbuf);
+ 	demo->pixbuf = NULL;
+@@ -139,6 +157,7 @@
+ 		height = page_width * demo->scale;
+ 	}
+ 
++#if defined (HAVE_CAIRO)
+ 	if (demo->mode == PGD_RENDER_CAIRO) {
+ 		cairo_t *cr;
+ 		
+@@ -179,6 +198,7 @@
+ 		
+ 		cairo_destroy (cr);
+ 	} else if (demo->mode == PGD_RENDER_PIXBUF) {
++#endif
+ 		timer = g_timer_new ();
+ 		demo->pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB,
+ 					       FALSE, 8, width, height);
+@@ -190,10 +210,11 @@
+ 					       demo->rotate,
+ 					       demo->pixbuf);
+ 		g_timer_stop (timer);
++#if defined (HAVE_CAIRO)
+ 	} else {
+ 		g_assert_not_reached ();
+ 	}
+-
++#endif
+ 	g_object_unref (page);
+ 	
+ 	str = g_strdup_printf ("<i>Page rendered in %.4f seconds</i>",
+@@ -360,7 +381,9 @@
+ 	gtk_widget_show (label);
+ 
+ 	mode_selector = gtk_combo_box_new_text ();
++#if defined (HAVE_CAIRO)
+ 	gtk_combo_box_append_text (GTK_COMBO_BOX (mode_selector), "cairo");
++#endif
+ 	gtk_combo_box_append_text (GTK_COMBO_BOX (mode_selector), "pixbuf");
+ 	gtk_combo_box_set_active (GTK_COMBO_BOX (mode_selector), 0);
+ 	g_signal_connect (G_OBJECT (mode_selector), "changed",
diff --git a/app-text/poppler-bindings/poppler-bindings-0.5.9.ebuild b/app-text/poppler-bindings/poppler-bindings-0.5.9.ebuild
deleted file mode 100644
index 9f4b1b6c98b3..000000000000
--- a/app-text/poppler-bindings/poppler-bindings-0.5.9.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler-bindings/poppler-bindings-0.5.9.ebuild,v 1.1 2007/05/31 13:58:40 genstef Exp $
-
-inherit autotools eutils multilib
-
-MY_P=${P/-bindings/}
-DESCRIPTION="rendering bindings for GUI toolkits for poppler"
-HOMEPAGE="http://poppler.freedesktop.org/"
-SRC_URI="http://poppler.freedesktop.org/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="gtk qt3 cairo qt4"
-
-RDEPEND="~app-text/poppler-${PV}
-	cairo? ( >=x11-libs/cairo-0.5 )
-	gtk? (
-		>=x11-libs/gtk+-2.6
-		>=gnome-base/libglade-2
-	)
-	qt3? ( =x11-libs/qt-3* )
-	qt4? ( =x11-libs/qt-4* )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	>=sys-devel/automake-1.9.6"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack(){
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/poppler-0.5.9-bindings.patch
-
-	AT_M4DIR="m4" eautoreconf
-	sed -i s:/usr/lib/qt:/usr/lib/qt4: configure
-}
-
-src_compile() {
-	# Configure needs help finding qt libs on multilib systems
-	export QTLIB="${QTDIR}/$(get_libdir)"
-	echo $QTLIB
-
-	econf --enable-opi \
-		$(use_enable cairo cairo-output) \
-		$(use_enable gtk poppler-glib) \
-		$(use_enable qt3 poppler-qt) \
-		$(use_enable qt4 poppler-qt4) \
-		|| die "configuration failed"
-	cd poppler
-	if use cairo; then
-		emake libpoppler-cairo.la || die "cairo failed"
-	fi
-	if use qt4; then
-		emake libpoppler-arthur.la || die "arthur failed"
-	fi
-	cd ..
-	emake || die "compilation failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-}
-
-pkg_postinst() {
-	ewarn "You need to rebuild everything depending on poppler, use revdep-rebuild"
-}
diff --git a/app-text/poppler-bindings/poppler-bindings-0.5.91.ebuild b/app-text/poppler-bindings/poppler-bindings-0.5.91.ebuild
deleted file mode 100644
index f6bdcbc638ae..000000000000
--- a/app-text/poppler-bindings/poppler-bindings-0.5.91.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler-bindings/poppler-bindings-0.5.91.ebuild,v 1.1 2007/08/23 06:28:28 genstef Exp $
-
-inherit autotools eutils multilib
-
-MY_P=${P/-bindings/}
-DESCRIPTION="rendering bindings for GUI toolkits for poppler"
-HOMEPAGE="http://poppler.freedesktop.org/"
-SRC_URI="http://poppler.freedesktop.org/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="gtk qt3 cairo qt4"
-
-RDEPEND="~app-text/poppler-${PV}
-	cairo? ( >=x11-libs/cairo-0.5 )
-	gtk? (
-		>=x11-libs/gtk+-2.6
-		>=gnome-base/libglade-2
-	)
-	qt3? ( =x11-libs/qt-3* )
-	qt4? ( =x11-libs/qt-4* )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	>=sys-devel/automake-1.9.6"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack(){
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/poppler-0.5.9-bindings.patch
-
-	AT_M4DIR="m4" eautoreconf
-	sed -i s:/usr/lib/qt:/usr/lib/qt4: configure
-}
-
-src_compile() {
-	# Configure needs help finding qt libs on multilib systems
-	export QTLIB="${QTDIR}/$(get_libdir)"
-	echo $QTLIB
-
-	econf --enable-opi \
-		$(use_enable cairo cairo-output) \
-		$(use_enable gtk poppler-glib) \
-		$(use_enable qt3 poppler-qt) \
-		$(use_enable qt4 poppler-qt4) \
-		|| die "configuration failed"
-	cd poppler
-	if use cairo; then
-		emake libpoppler-cairo.la || die "cairo failed"
-	fi
-	if use qt4; then
-		emake libpoppler-arthur.la || die "arthur failed"
-	fi
-	cd ..
-	emake || die "compilation failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-}
-
-pkg_postinst() {
-	ewarn "You need to rebuild everything depending on poppler, use revdep-rebuild"
-}
diff --git a/app-text/poppler-bindings/poppler-bindings-0.6.ebuild b/app-text/poppler-bindings/poppler-bindings-0.6.ebuild
index 76173d2a3343..0686c0fb18e6 100644
--- a/app-text/poppler-bindings/poppler-bindings-0.6.ebuild
+++ b/app-text/poppler-bindings/poppler-bindings-0.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler-bindings/poppler-bindings-0.6.ebuild,v 1.1 2007/09/04 06:53:33 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler-bindings/poppler-bindings-0.6.ebuild,v 1.2 2007/09/06 17:48:22 genstef Exp $
 
 inherit autotools eutils multilib
 
@@ -33,6 +33,7 @@ src_unpack(){
 	cd "${S}"
 
 	epatch "${FILESDIR}"/poppler-0.6-bindings.patch
+	epatch "${FILESDIR}"/poppler-nocairo.patch
 
 	AT_M4DIR="m4" eautoreconf
 	sed -i s:/usr/lib/qt:/usr/lib/qt4: configure