4 files changed, 73 insertions, 25 deletions
diff --git a/app-text/poppler/ChangeLog b/app-text/poppler/ChangeLog
index 32efc569b038..01fc3c08c999 100644
--- a/app-text/poppler/ChangeLog
+++ b/app-text/poppler/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-text/poppler
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.303 2011/10/18 21:57:44 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.304 2011/11/01 14:03:41 reavertm Exp $
+
+*poppler-0.18.1 (01 Nov 2011)
+
+  01 Nov 2011; Maciej Mrozowski <reavertm@gentoo.org>
+  +files/poppler-0.18.1-pkgconfig.patch, +poppler-0.18.1.ebuild,
+  -files/poppler-0.18.0-poppler_page_get_image-crash.patch,
+  -poppler-0.18.0.ebuild:
+  Version bump, remove old
 
   18 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -poppler-0.14.5-r1.ebuild:
diff --git a/app-text/poppler/files/poppler-0.18.0-poppler_page_get_image-crash.patch b/app-text/poppler/files/poppler-0.18.0-poppler_page_get_image-crash.patch
deleted file mode 100644
index b4388e012584..000000000000
--- a/app-text/poppler/files/poppler-0.18.0-poppler_page_get_image-crash.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From d2706a05513134f961e2500e0e596f2769707ce5 Mon Sep 17 00:00:00 2001
-From: Adrian Johnson <ajohnson@redneon.com>
-Date: Wed, 28 Sep 2011 11:50:23 +0000
-Subject: cairo: fix crash when using poppler_page_get_image()
-
----
-diff --git a/poppler/CairoOutputDev.h b/poppler/CairoOutputDev.h
-index effa9dd..0f202a5 100644
---- a/poppler/CairoOutputDev.h
-+++ b/poppler/CairoOutputDev.h
-@@ -434,6 +434,7 @@ public:
-   virtual void stroke(GfxState *state) { }
-   virtual void fill(GfxState *state) { }
-   virtual void eoFill(GfxState *state) { }
-+  virtual void clipToStrokePath(GfxState *state) { }
-   virtual GBool tilingPatternFill(GfxState *state, Catalog *cat, Object *str,
- 				  double *pmat, int paintType, int tilingType, Dict *resDict,
- 				  double *mat, double *bbox,
---
-cgit v0.9.0.2-2-gbebe
diff --git a/app-text/poppler/files/poppler-0.18.1-pkgconfig.patch b/app-text/poppler/files/poppler-0.18.1-pkgconfig.patch
new file mode 100644
index 000000000000..5cbdd5a7ee60
--- /dev/null
+++ b/app-text/poppler/files/poppler-0.18.1-pkgconfig.patch
@@ -0,0 +1,60 @@
+From ebf7fbc74da10d1bc423d33b26e30166870642e4 Mon Sep 17 00:00:00 2001
+From: Rex Dieter <rdieter@math.unl.edu>
+Date: Tue, 01 Nov 2011 08:40:53 +0000
+Subject: Fix pkg-config files
+
+We were using $FOO_REQUIRED instead of @FOO_REQUIRED@
+---
+diff --git a/configure.ac b/configure.ac
+index 3a120ca..c4f5b92 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -409,6 +409,7 @@ if test x$enable_cairo_output = xyes; then
+   POPPLER_GLIB_DISABLE_SINGLE_INCLUDES=""
+ 
+   GLIB_REQUIRED=2.18
++  AC_SUBST(GLIB_REQUIRED)
+   AC_ARG_ENABLE(poppler-glib,
+ 	        AC_HELP_STRING([--disable-poppler-glib],
+ 		               [Don't compile poppler glib wrapper.]),
+diff --git a/poppler-glib-uninstalled.pc.in b/poppler-glib-uninstalled.pc.in
+index 55a2278..5fcb6f2 100644
+--- a/poppler-glib-uninstalled.pc.in
++++ b/poppler-glib-uninstalled.pc.in
+@@ -1,7 +1,7 @@
+ Name: poppler-glib
+ Description: GLib wrapper for poppler - uninstalled
+ Version: @VERSION@
+-Requires: glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED cairo >= $CAIRO_VERSION
++Requires: glib-2.0 >= @GLIB_REQUIRED@ gobject-2.0 >= @GLIB_REQUIRED@ cairo >= @CAIRO_VERSION@
+ 
+ Libs: ${pc_top_builddir}/${pcfiledir}/glib/libpoppler-glib.la
+ Cflags: -I${pc_top_builddir}/${pcfiledir}/glib
+diff --git a/poppler-glib.pc.cmake b/poppler-glib.pc.cmake
+index 3264ed6..e15e669 100644
+--- a/poppler-glib.pc.cmake
++++ b/poppler-glib.pc.cmake
+@@ -6,7 +6,7 @@ includedir=${prefix}/include
+ Name: poppler-glib
+ Description: GLib wrapper for poppler
+ Version: @POPPLER_VERSION@
+-Requires: glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED cairo >= $CAIRO_VERSION
++Requires: glib-2.0 >= @GLIB_REQUIRED@ gobject-2.0 >= @GLIB_REQUIRED@ cairo >= @CAIRO_VERSION@
+ @PC_REQUIRES_PRIVATE@
+ 
+ Libs: -L${libdir} -lpoppler-glib
+diff --git a/poppler-glib.pc.in b/poppler-glib.pc.in
+index 04d9bb9..9ba8978 100644
+--- a/poppler-glib.pc.in
++++ b/poppler-glib.pc.in
+@@ -6,7 +6,7 @@ includedir=@includedir@
+ Name: poppler-glib
+ Description: GLib wrapper for poppler
+ Version: @VERSION@
+-Requires: glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED cairo >= $CAIRO_VERSION
++Requires: glib-2.0 >= @GLIB_REQUIRED@ gobject-2.0 >= @GLIB_REQUIRED@ cairo >= @CAIRO_VERSION@
+ @PC_REQUIRES_PRIVATE@
+ 
+ Libs: -L${libdir} -lpoppler-glib
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/app-text/poppler/poppler-0.18.0.ebuild b/app-text/poppler/poppler-0.18.1.ebuild
index 31d070827226..7b87f6094fc6 100644
--- a/app-text/poppler/poppler-0.18.0.ebuild
+++ b/app-text/poppler/poppler-0.18.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.18.0.ebuild,v 1.1 2011/09/28 23:06:04 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.18.1.ebuild,v 1.1 2011/11/01 14:03:41 reavertm Exp $
 
 EAPI="4"
 
@@ -50,12 +50,12 @@ RDEPEND="${COMMON_DEPEND}
 	cjk? ( >=app-text/poppler-data-0.4.4 )
 "
 
-DOCS=(AUTHORS ChangeLog NEWS README README-XPDF TODO)
-
 PATCHES=(
-	"${FILESDIR}/${P}-poppler_page_get_image-crash.patch"
+	"${FILESDIR}/${P}-pkgconfig.patch"
 )
 
+DOCS=(AUTHORS ChangeLog NEWS README README-XPDF TODO)
+
 src_configure() {
 	mycmakeargs=(
 		-DBUILD_GTK_TESTS=OFF