Version bump, add patch for building with poppler-0.31.0 (bug 539492)

(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key EBE6A336BE19039C!)

6 files changed, 93 insertions, 12 deletions

diff --git a/net-print/cups-filters/ChangeLog b/net-print/cups-filters/ChangeLog
index e6c3a711d378..423816ddb375 100644
--- a/net-print/cups-filters/ChangeLog
+++ b/net-print/cups-filters/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-print/cups-filters
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/ChangeLog,v 1.134 2014/12/13 20:58:12 dilfridge Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/ChangeLog,v 1.135 2015/02/14 19:48:55 dilfridge Exp $
+
+*cups-filters-1.0.65 (14 Feb 2015)
+
+  14 Feb 2015; Andreas K. Huettel <dilfridge@gentoo.org>
+  cups-filters-1.0.53.ebuild, -cups-filters-1.0.54.ebuild,
+  cups-filters-1.0.61.ebuild, +cups-filters-1.0.65.ebuild,
+  cups-filters-9999.ebuild, +files/cups-filters-1.0.65-poppler0310.patch:
+  Version bump, add patch for building with poppler-0.31.0 (bug 539492)
 
   13 Dec 2014; Andreas K. Huettel <dilfridge@gentoo.org>
   cups-filters-1.0.53.ebuild, cups-filters-1.0.54.ebuild,
diff --git a/net-print/cups-filters/cups-filters-1.0.53.ebuild b/net-print/cups-filters/cups-filters-1.0.53.ebuild
index baf4e6494921..ce6deb3f1935 100644
--- a/net-print/cups-filters/cups-filters-1.0.53.ebuild
+++ b/net-print/cups-filters/cups-filters-1.0.53.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/cups-filters-1.0.53.ebuild,v 1.15 2014/12/13 20:58:12 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/cups-filters-1.0.53.ebuild,v 1.16 2015/02/14 19:48:55 dilfridge Exp $
 
 EAPI=5
 
@@ -25,7 +25,7 @@ IUSE="dbus +foomatic jpeg perl png static-libs tiff zeroconf"
 
 RDEPEND="
 	>=app-text/ghostscript-gpl-9.09
-	app-text/poppler:=[cxx,jpeg?,lcms,tiff?,xpdf-headers(+)]
+	<app-text/poppler-0.31.0:=[cxx,jpeg?,lcms,tiff?,xpdf-headers(+)]
 	>=app-text/qpdf-3.0.2:=
 	media-libs/fontconfig
 	media-libs/freetype:2
diff --git a/net-print/cups-filters/cups-filters-1.0.61.ebuild b/net-print/cups-filters/cups-filters-1.0.61.ebuild
index 9aef637e5ff5..9f9eb1d85058 100644
--- a/net-print/cups-filters/cups-filters-1.0.61.ebuild
+++ b/net-print/cups-filters/cups-filters-1.0.61.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/cups-filters-1.0.61.ebuild,v 1.3 2014/12/13 20:58:12 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/cups-filters-1.0.61.ebuild,v 1.4 2015/02/14 19:48:55 dilfridge Exp $
 
 EAPI=5
 
@@ -25,7 +25,7 @@ IUSE="dbus +foomatic jpeg perl png static-libs tiff zeroconf"
 
 RDEPEND="
 	>=app-text/ghostscript-gpl-9.09
-	app-text/poppler:=[cxx,jpeg?,lcms,tiff?,xpdf-headers(+)]
+	<app-text/poppler-0.31.0:=[cxx,jpeg?,lcms,tiff?,xpdf-headers(+)]
 	>=app-text/qpdf-3.0.2:=
 	media-libs/fontconfig
 	media-libs/freetype:2
diff --git a/net-print/cups-filters/cups-filters-1.0.54.ebuild b/net-print/cups-filters/cups-filters-1.0.65.ebuild
index 940ddec157a8..3acbcb2b6c7c 100644
--- a/net-print/cups-filters/cups-filters-1.0.54.ebuild
+++ b/net-print/cups-filters/cups-filters-1.0.65.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/cups-filters-1.0.54.ebuild,v 1.6 2014/12/13 20:58:12 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/cups-filters-1.0.65.ebuild,v 1.1 2015/02/14 19:48:55 dilfridge Exp $
 
 EAPI=5
 
@@ -44,6 +44,10 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
+PATCHES=(
+	"${FILESDIR}/${P}-poppler0310.patch"
+)
+
 src_prepare() {
 	base_src_prepare
 	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die
diff --git a/net-print/cups-filters/cups-filters-9999.ebuild b/net-print/cups-filters/cups-filters-9999.ebuild
index 6eee73be300c..255f4d525dff 100644
--- a/net-print/cups-filters/cups-filters-9999.ebuild
+++ b/net-print/cups-filters/cups-filters-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/cups-filters-9999.ebuild,v 1.52 2014/12/13 20:58:12 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/cups-filters-9999.ebuild,v 1.53 2015/02/14 19:48:55 dilfridge Exp $
 
 EAPI=5
 
@@ -44,6 +44,10 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-1.0.65-poppler0310.patch"
+)
+
 src_prepare() {
 	base_src_prepare
 	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die
diff --git a/net-print/cups-filters/files/cups-filters-1.0.65-poppler0310.patch b/net-print/cups-filters/files/cups-filters-1.0.65-poppler0310.patch
new file mode 100644
index 000000000000..569d835cfe02
--- /dev/null
+++ b/net-print/cups-filters/files/cups-filters-1.0.65-poppler0310.patch
@@ -0,0 +1,65 @@
+Source: http://www.linuxfromscratch.org/blfs/view/svn/pst/cups-filters.html
+
+Submitted By:            Armin K. <krejzi at email dot com>
+Date:                    2015-02-10
+Initial Package Version: 1.0.62
+Upstream Status:         Submitted
+Origin:                  Self
+Description:             Fixes building when using Poppler 0.31.x.
+
+--- a/filter/pdftoijs.cxx	2013-12-10 22:20:15.000000000 +0100
++++ b/filter/pdftoijs.cxx	2015-02-10 21:51:32.700190378 +0100
+@@ -436,7 +436,11 @@
+   }
+ 
+   out = new SplashOutputDev(cmode,rowpad/* row padding */,
+-    reverseVideo,paperColor,gTrue,gFalse);
++    reverseVideo,paperColor,gTrue
++#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR <= 30
++    ,gFalse
++#endif
++    );
+ #if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 19
+   out->startDoc(doc);
+ #else
+--- a/filter/pdftoopvp/OPVPOutputDev.cxx	2014-03-10 12:19:19.000000000 +0100
++++ b/filter/pdftoopvp/OPVPOutputDev.cxx	2015-02-10 21:52:09.092847693 +0100
+@@ -278,7 +278,11 @@
+ 				    gFalse,
+                                     gFalse,
+ #endif
++#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR <= 30
+ 				    globalParams->getAntialias());
++#else
++                                    gFalse);
++#endif
+   for (i = 0; i < nT3Fonts; ++i) {
+     delete t3FontCache[i];
+   }
+--- a/filter/pdftoopvp/pdftoopvp.cxx	2013-12-10 22:20:15.000000000 +0100
++++ b/filter/pdftoopvp/pdftoopvp.cxx	2015-02-10 21:51:32.701190397 +0100
+@@ -614,7 +614,9 @@
+       ok = gFalse;
+     }
+   }
++#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR <= 30
+   globalParams->setAntialias("no");
++#endif
+   if (quiet) {
+     globalParams->setErrQuiet(quiet);
+   }
+--- a/filter/pdftoraster.cxx	2014-09-26 18:23:04.000000000 +0200
++++ b/filter/pdftoraster.cxx	2015-02-10 21:51:32.701190397 +0100
+@@ -2100,7 +2100,11 @@
+   }
+ 
+   out = new SplashOutputDev(cmode,rowpad/* row padding */,
+-    gFalse,paperColor,gTrue,gFalse);
++    gFalse,paperColor,gTrue
++#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR <= 30
++    ,gFalse
++#endif
++    );
+ #if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 19
+   out->startDoc(doc);
+ #else