Backport patch for poppler-0.24; specify dep on maximal poppler-0.22 for stable version; add nonsensically dropped s390

Package-Manager: portage-2.2.0_alpha196/cvs/Linux x86_64
Manifest-Sign-Key: 0x84AD142F

7 files changed, 392 insertions, 26 deletions

diff --git a/net-print/cups-filters/ChangeLog b/net-print/cups-filters/ChangeLog
index 9bf940874f0d..a4f11fd558f4 100644
--- a/net-print/cups-filters/ChangeLog
+++ b/net-print/cups-filters/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-print/cups-filters
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/ChangeLog,v 1.71 2013/08/06 12:34:23 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/ChangeLog,v 1.72 2013/08/11 17:51:16 dilfridge Exp $
+
+*cups-filters-1.0.35-r1 (11 Aug 2013)
+
+  11 Aug 2013; Andreas K. Huettel <dilfridge@gentoo.org>
+  cups-filters-1.0.34-r1.ebuild, cups-filters-1.0.35.ebuild,
+  +cups-filters-1.0.35-r1.ebuild, +files/cups-filters-1.0.35-poppler24.patch,
+  cups-filters-9999.ebuild:
+  Backport patch for poppler-0.24; specify dep on maximal poppler-0.22 for
+  stable version; add nonsensically dropped s390
 
   06 Aug 2013; Agostino Sarubbo <ago@gentoo.org> cups-filters-1.0.34-r1.ebuild:
   Stable for s390, wrt bug #442926
diff --git a/net-print/cups-filters/Manifest b/net-print/cups-filters/Manifest
index 65a7394f53b8..769afdd2eec7 100644
--- a/net-print/cups-filters/Manifest
+++ b/net-print/cups-filters/Manifest
@@ -1,29 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX cups-browsed.init.d 399 SHA256 d4d27c920ab062532755b553544ff3ef4d561d03bda0728d21e71c83d0e904bd SHA512 3762f18e57e317e4e2b40b1f42da79e383de4f4a360cd7317ae1780edd44ffde007b0ced88bac6b24d082d0fab19425360eec891ba86fe46d9e201e1081a2beb WHIRLPOOL 38782d813df3be20f1d6a15c2aecc94a1409bd8e90b0a2f65f73f512b3ff37afc06c57dbd6be24abd1dead189ea1c75292bc45e68303de4141ef748e9ca58577
 AUX cups-browsed.service 225 SHA256 f4cd6ac0da207deb3b9991264fcb8d3468ae7c5c4fcd1957d296d344fd9e3d44 SHA512 16d7a8b0c95827582706764ca6f96720561e8c314929f6d53c98dccb68b6df21d5928949b0aaf7c2f738ab5c07ee2678d643b9acb6b581bb77a67db950082cdb WHIRLPOOL d1606f5ebfc84398502282e9c1e42bed6701f2d4e284f1214ef924aa94fe2be3e169d83f9d9fdd34a817514df35e680f38b3e91fb7e965510621e3fad8002f14
+AUX cups-filters-1.0.35-poppler24.patch 6610 SHA256 50a772cf0eb406098bb1a01b103da534a456096713e72ec8faddc93e6714ef72 SHA512 a21ce43caf80a7d7c9e001e5b6f4a1e93f6d00f09d1aff48a91d9998f937627f4c13a00701bda4f9176bd1601bb1d51b7cb528c7dcdb16ad4b8d9bc6147ebc1d WHIRLPOOL b3d3bf88f92fad19fc64303094043131eb232e1fa486cb7b7765437e24676d1825a20259c7198a7d4dce61bb4bbe6a93281049b8e6957dcaa13d5e6971b96d9b
 DIST cups-filters-1.0.34.tar.xz 1015416 SHA256 24995edfd31fc58a0c5be09631650dfacea8664e0e0d2b61c3859bf992d9b371 SHA512 1cb8e0e5998f09512276bcca17d8635223ed3717573460b351fdd5a11bcb0fc4dd46771afc1ff9c2f87d007f8035c78704dea7afc2d67978d09c035ed58cebd6 WHIRLPOOL 855bb40d200d147b87ca602aa3fdb838ee47f8c692e5a4b91b085adda890b3b869a30993ad380a0c0f8038537bf0b4536e8feedfe153e52d4e65d031bb625ad9
 DIST cups-filters-1.0.35.tar.xz 1016968 SHA256 5de5d6f4405de56f7dcd8d113eae7202e9ac1cdd6554a8d7985902e35ac7d592 SHA512 565e1338fc5eccbd048538158e53b925f7c6fcda93f30c55bdfdf6eed02d21f4d01eb3e1971519ba7e7b845c6b240fa92a3889a91d32234b70a0d5638d9fc2d8 WHIRLPOOL 4b035933757b31baa8f98c161c9510d4d92ac74fb9bd18c2e3d12a249055c145b80ce2187e8aabe52626793a1eda3f0f708d38b1352945a2c72b216ed90f7382
-EBUILD cups-filters-1.0.34-r1.ebuild 2798 SHA256 414554e427ef9b23710ee6d8fa2304964f089898663c94160e92e24defd9de9f SHA512 82cc89b3b274cd463dbbec9ca8b555699fa0a6c28f3a13342e30c3268f0ce485ece70913d7a70bb9c4362fa04a1430a8c0c146308b50c9245d9aea36df8c3298 WHIRLPOOL 2c9ee87200acb16ac76ca6a8bb8ef2a42d4338be517cd7254681cb2e4289265561491a62c658d1cf973f263fdf6f6600399125c89919a29513bd4e5a7b4686bc
-EBUILD cups-filters-1.0.35.ebuild 2806 SHA256 46410666ad89b7b6304da7841ef5188a99b158904d26dd6a6fd900047e2d432c SHA512 3e38927fd1217fa8063abff9aa6197e0b55b2a9eb0ab5e7a2977b8e2de93c4c78e0e5d6dd7f8e8eba9fc4d49e64e82aa10f4c1a5bccc47dc3f9501028bcebf2a WHIRLPOOL d0d302bd5945d251eeb81c974295f8feeaf3cec1b62dd7e923151c277a4129b9412bf7b64d7abb6878cf20345c59ce1682e1c27aa6c84cd0fb8f2f559c80a617
-EBUILD cups-filters-9999.ebuild 2805 SHA256 4382f8f2c25b5c11b269bf8d20872d89984bdded8161d41411a0f960161e2c18 SHA512 90d41fe122a9ee2a501f5831af30a1b4c4f073570e4ca3ad36a1d48b7a628abe28796698ec9c9d474019956a2d0533ef89fe3d08cfb40750f942b0783380d73d WHIRLPOOL a4c97766095ec791d85943589336933423dc98bc41f1aec0bf82f8fec4bb62fa0096aee44df132a260922422e1ee7ceeb62db973cb1e6d4103c55235a92077fd
-MISC ChangeLog 12530 SHA256 fd6a72afabe1e4f65580e0236245b7fb12d63a1a0460d5bf71a07a3704b8350b SHA512 7e87e58f4a3617315eb0b41ec27f5b4a906b6be8211749d072250d5663d9587d4ad2a4407ef817410a07878201e6c3f71c9e626aade83c062cf17f500922ff20 WHIRLPOOL 4c3b146588b5ffea283b5ac345aa0adc7d00ff9095597c0b7adca39dccfb075dd206e02793aedfff470217539a36cbf9194dc292f8dcadd4618ce894d007286b
+EBUILD cups-filters-1.0.34-r1.ebuild 2810 SHA256 307b6ad56202f1f117ef38b43784c8176bca774adb0ca20b20568b2f7eaacf58 SHA512 50c053351c6a5abf3c71cfc531ee171093e8c6d00d4588b1a797dd2822927822934a000646baab6eabbb33641341e7c8a5283e9b73192d3ca11000390a0d0ef5 WHIRLPOOL 3d6e23a07ef3d8997804cec2720e338dc09deb8e2f802ba0a3f540828685c9dd834eb08cae2469a92cbb4fc31447fc968efcff46b20d623a1705684c3135cc3e
+EBUILD cups-filters-1.0.35-r1.ebuild 2863 SHA256 d8c5669d451b391221690aa121641c5e19f00d5faa2c81ce7cf28d1f8e0543a3 SHA512 4172adbc88c79a94c823822dbdcd0897dc9e5bdd49f102ee86a3864fca531f705a19a777db89588244fb3e4be1c437141924876dac871348787150571e8ac67f WHIRLPOOL a40a641b7f521ef29343a634e53d31aa1631d86ba2bdf5d20c4b2d289434f76ad8ae79d12a4c09615b818d2ffa2999eeb9184eac1b96eb53d602acee951f0e8a
+EBUILD cups-filters-1.0.35.ebuild 2818 SHA256 58571958946b21389adc86aca03f14c360ce95a8fc88484b9cd11dd5d8f33983 SHA512 aa8260d1dd0ad394dbdfc475d13496ec38e9bb75b41e773213c237f1fed7100cbe8876f9e0a1fdb7c6aedc91dc69da9fbb8f0edcc8a3ef5cc6cce59c95591662 WHIRLPOOL 990e073f4abec15ae4253ead3c70a4a52613768143b345d9f09a3d2624a63eb1e8cf9aa9a4b0af5afad4374af0de3f12f99a36d000155f1f218f74cef35e2dd1
+EBUILD cups-filters-9999.ebuild 2811 SHA256 8bbdecea2416b060be18eb492e11327c6eb9838832e5029cc6424b6542f79822 SHA512 6cac51b48fd823363f6f56478c1ae24d2c4c576391227858a7f6894fbd76bd3a0fd6a3c10d4846f631fe266eef5df5b3974c106d57b414ef2160315c9cbef59a WHIRLPOOL 11ce1a402784357e408d8905ed6d32c04e567a30770a2f290217f29afd14071d091fbb27e71764240172001cb4e2ce80143a6039aa64ffef70f38cdb3e229f41
+MISC ChangeLog 12924 SHA256 4418c755cee3133ded45fed92e29d8b6c6a1bdf439b7d29e0dcc77370de85f52 SHA512 dae9f51760f3edf4650783681272f13b234b04d663942f70d3ceb1de3cff209866a0a0e0ed3ba072ab96f78c59a8788683ec72ff7bc9f5167ec73f4b3e7f90ea WHIRLPOOL 0e45190d948b079d38445ba3e882f287e3c63e7fb89306186edfdcd7961dc1b4a305b337d2d7877409f6a3baacb5e3cf516f92eeb8977ed8d475a80edbb8d033
 MISC metadata.xml 162 SHA256 753dd90680a9d937cb438cbf14dc217d518514d1596682a4e3478b1b7c7ba051 SHA512 ff7cd6e9d088c1ce0107a86a693abddb12d1385e8f9abb2614aa5cb8ed0c046a1387ccab1643fe711e84df1fa23659ce490f68f0504bbb908b7662a0ac490a03 WHIRLPOOL ccbf59144f058b49de3d54bbe6d92e2d2e8b605df10d5143ccfd7e4a021069ca025e87b4179179a60091c03d8bf1e371207c35f1102c2c1f848bf6697e9c2bb2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSAOyPAAoJELp701BxlEWfCAsP/3xzLvzLOz4jtmnBcrMv33h8
-e+0ZDrIb0lWQR278YAVqP7I6egDqt3cqjrvQ4IHzNIDn6IN/8md1sqZHr+3c+7lN
-47w4ba+McxAXqtQCwJBR78pwxHLi2kJGaiOH9mUJuxd+tTJMUUQVoM5t3IuGDstF
-bcQCY0q9FgIBSzKXcCzzpRQdrHo6AGl0l8p5zbRVUdDeN3+zX6AgffhcTuND+MO1
-A9Zk65IY6OUuzvC9cJ0mQrrTruy4GvG6/Lg0I7VNs0bpKWhshjMb4ifdsFTJ9284
-x9TFqkaGkqQ1T9F/0NUmcAloeK6wxDvKWRve2Fh2dwnYJeuUpqyakOR3LqBOIbg8
-IkiwwheEKJ41lmJ3+8GmfU+g31R5QoZv27JstR1erYmzsocRMkT2SZ0GINg85KyE
-V7dXGwAwuHyXwIrCV2eq9xEKLcZtLEsuDUcJdE+rz+bgcUm1WZiu00qCMTUEX/ER
-IglI3dcEYqIjqXlqOKfPnfcflKQgwNFprvlkvX4sC2ZlHGcZqIfDcQlSbEUvX1rU
-6qWV4goyBbWYtQWHu109NzWQCnluvXH3gprmXWmc49Dj9JcTMXHn6sJKBCrKoSMa
-eBGJSRSnPfFow0u25iSr5VCXIqb+6K06rjf9t6EIMuVsLB8mKAcWzOghH79UhBQL
-06022ngDnjBo6Riub6SC
-=LyuK
+iQIcBAEBCAAGBQJSB88qAAoJEJS/30SErRQvzPcQAIIuKH0lJosv2tqZDTLxB9zv
+W4kL0kiVwsAH2o1eKNheFNMMixddq1uKWH43LcSIaSbP5LYEjjCcLqboReLf/8Nq
+MFDEN3vhPWqrll84oaxWxamvaFbhv0gWeuAo8TUTEMr6f4aJUT+/UPsAJch5r+8t
+Oj38Fb5dGxTqafXOiuAUqmrEzW5wa/miWx61VciU0wEaqvhrr+U2EAQ5gpIF5/yj
+WmmFgHYNYUdf4lspqewLYmlTSU+iR1ePoFkG4p+P6SGIxxHKrBpOgHQeHSiWMUcP
+n0Ml0lVgDlrsJY5PkBdeYPDfIINUAYbM/vxjSHqZQb39Ays2X6XUPpwy/mOsRFhd
+h93OX/ENrmb0SFA48ZP63ya8g274CpuwNkCJw3nkeNozLh/GMOVVBzPJJCVLlQnE
+1McxdoiVX8HCfMJFbxcMoeEGYw7T6Dj+D//KNqZ/ZSAmksPIumGsu89f609BzlMQ
+lqBbDQQoD5KU+xkCRhNxM1qrmNj9eljXIkalCwcropeb6YPIH6GQwzCUt1jx/yRZ
+cOzsfKsRTycoXAK1ZJadKZgFRRXZB+iFfwmo7cf30R8AlLAFEKHmu+hquXLU7Lvk
+2SjS0PkbZjKxwu41LkXANugoQGT91fQGnW51qPCCOJING+Mrh2rewe7+omIgTbEa
+NR5R2snXIaEoQ6LyMCUy
+=YHP+
 -----END PGP SIGNATURE-----
diff --git a/net-print/cups-filters/cups-filters-1.0.34-r1.ebuild b/net-print/cups-filters/cups-filters-1.0.34-r1.ebuild
index 6c0d92fa03d1..5762aee8fc5f 100644
--- a/net-print/cups-filters/cups-filters-1.0.34-r1.ebuild
+++ b/net-print/cups-filters/cups-filters-1.0.34-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.34-r1.ebuild,v 1.12 2013/08/06 12:34:23 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/cups-filters-1.0.34-r1.ebuild,v 1.13 2013/08/11 17:51:16 dilfridge Exp $
 
 EAPI=5
 
@@ -25,7 +25,7 @@ IUSE="jpeg perl png static-libs tiff zeroconf"
 
 RDEPEND="
 	app-text/ghostscript-gpl
-	app-text/poppler:=[cxx,jpeg?,lcms,tiff?,xpdf-headers(+)]
+	<app-text/poppler-0.24:=[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.35-r1.ebuild b/net-print/cups-filters/cups-filters-1.0.35-r1.ebuild
new file mode 100644
index 000000000000..4d31401f5021
--- /dev/null
+++ b/net-print/cups-filters/cups-filters-1.0.35-r1.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2013 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.35-r1.ebuild,v 1.1 2013/08/11 17:51:16 dilfridge Exp $
+
+EAPI=5
+
+GENTOO_DEPEND_ON_PERL=no
+
+inherit base eutils perl-module autotools systemd
+
+if [[ "${PV}" == "9999" ]] ; then
+	inherit bzr
+	EBZR_REPO_URI="http://bzr.linuxfoundation.org/openprinting/cups-filters"
+	KEYWORDS=""
+else
+	SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~s390 ~x86 ~amd64-fbsd"
+fi
+DESCRIPTION="Cups PDF filters"
+HOMEPAGE="http://www.linuxfoundation.org/collaborate/workgroups/openprinting/pdfasstandardprintjobformat"
+
+LICENSE="MIT GPL-2"
+SLOT="0"
+IUSE="jpeg perl png static-libs tiff zeroconf"
+
+RDEPEND="
+	app-text/ghostscript-gpl
+	app-text/poppler:=[cxx,jpeg?,lcms,tiff?,xpdf-headers(+)]
+	>=app-text/qpdf-3.0.2:=
+	media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/lcms:2
+	>net-print/cups-1.5.9999
+	!<=net-print/cups-1.5.9999
+	sys-devel/bc
+	sys-libs/zlib
+	jpeg? ( virtual/jpeg )
+	perl? ( dev-lang/perl )
+	png? ( media-libs/libpng:0= )
+	tiff? ( media-libs/tiff )
+	zeroconf? ( net-dns/avahi[dbus] )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-poppler24.patch" )
+
+src_prepare() {
+	base_src_prepare
+	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		$(use_enable zeroconf avahi) \
+		$(use_enable static-libs static) \
+		--with-fontdir="fonts/conf.avail" \
+		--with-pdftops=pdftops \
+		--enable-imagefilters \
+		$(use_with jpeg) \
+		$(use_with png) \
+		$(use_with tiff) \
+		--with-rcdir=no \
+ 		--with-browseremoteprotocols=DNSSD,CUPS \
+		--without-php
+}
+
+src_compile() {
+	default
+
+	if use perl; then
+		pushd "${S}/scripting/perl" > /dev/null
+		perl-module_src_prep
+		perl-module_src_compile
+		popd > /dev/null
+	fi
+}
+
+src_install() {
+	default
+
+	if use perl; then
+		pushd "${S}/scripting/perl" > /dev/null
+		perl-module_src_install
+		fixlocalpod
+		popd > /dev/null
+	fi
+
+	prune_libtool_files --all
+
+	cp "${FILESDIR}"/cups-browsed.init.d "${T}"/cups-browsed || die
+	cp "${FILESDIR}/cups-browsed.service" "${T}"/ || die
+
+	if ! use zeroconf ; then
+		sed -i -e 's:need cupsd avahi-daemon:need cupsd:g' "${T}"/cups-browsed || die
+		sed -i -e 's:cups\.service avahi-daemon\.service:cups.service:g' "${T}"/cups-browsed.service || die
+	fi
+
+	doinitd "${T}"/cups-browsed
+	systemd_dounit "${T}/cups-browsed.service"
+}
+
+pkg_postinst() {
+	perl-module_pkg_postinst
+
+	elog "This version of cups-filters includes cups-browsed, a daemon that autodiscovers"
+	elog "remote queues via avahi or cups-1.5 browsing protocol and adds them to your cups"
+	elog "configuration. You may want to add it to your default runlevel."
+}
diff --git a/net-print/cups-filters/cups-filters-1.0.35.ebuild b/net-print/cups-filters/cups-filters-1.0.35.ebuild
index 220b09fadc3b..20027edba8f0 100644
--- a/net-print/cups-filters/cups-filters-1.0.35.ebuild
+++ b/net-print/cups-filters/cups-filters-1.0.35.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.35.ebuild,v 1.2 2013/07/07 17:16:58 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/cups-filters-1.0.35.ebuild,v 1.3 2013/08/11 17:51:16 dilfridge Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ if [[ "${PV}" == "9999" ]] ; then
 	KEYWORDS=""
 else
 	SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~s390 ~x86 ~amd64-fbsd"
 fi
 DESCRIPTION="Cups PDF filters"
 HOMEPAGE="http://www.linuxfoundation.org/collaborate/workgroups/openprinting/pdfasstandardprintjobformat"
@@ -25,7 +25,7 @@ IUSE="jpeg perl png static-libs tiff zeroconf"
 
 RDEPEND="
 	app-text/ghostscript-gpl
-	app-text/poppler:=[cxx,jpeg?,lcms,tiff?,xpdf-headers(+)]
+	<app-text/poppler-0.24:=[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-9999.ebuild b/net-print/cups-filters/cups-filters-9999.ebuild
index 42c47d0e695b..df594e37a87b 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-2013 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.37 2013/07/07 17:16:58 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/cups-filters-9999.ebuild,v 1.38 2013/08/11 17:51:16 dilfridge Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ if [[ "${PV}" == "9999" ]] ; then
 	KEYWORDS=""
 else
 	SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~s390 ~x86 ~amd64-fbsd"
 fi
 DESCRIPTION="Cups PDF filters"
 HOMEPAGE="http://www.linuxfoundation.org/collaborate/workgroups/openprinting/pdfasstandardprintjobformat"
diff --git a/net-print/cups-filters/files/cups-filters-1.0.35-poppler24.patch b/net-print/cups-filters/files/cups-filters-1.0.35-poppler24.patch
new file mode 100644
index 000000000000..a56541dcb412
--- /dev/null
+++ b/net-print/cups-filters/files/cups-filters-1.0.35-poppler24.patch
@@ -0,0 +1,245 @@
+diff -ruN cups-filters-1.0.35.orig/filter/pdf.cxx cups-filters-1.0.35/filter/pdf.cxx
+--- cups-filters-1.0.35.orig/filter/pdf.cxx	2012-08-20 02:29:46.000000000 +0200
++++ cups-filters-1.0.35/filter/pdf.cxx	2013-08-11 19:40:52.375948401 +0200
+@@ -17,6 +17,10 @@
+ #include "pdf.h"
+ 
+ #include <PDFDoc.h>
++#include <config.h>
++#ifdef HAVE_CPP_POPPLER_VERSION_H
++#include "cpp/poppler-version.h"
++#endif
+ 
+ 
+ extern "C" pdf_t * pdf_load_template(const char *filename)
+@@ -343,7 +347,11 @@
+     {
+     }
+ 
++#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 23
++    Goffset getPos()
++#else
+     int getPos()
++#endif
+     {
+         return this->pos;
+     }
+diff -ruN cups-filters-1.0.35.orig/filter/pdftoijs.cxx cups-filters-1.0.35/filter/pdftoijs.cxx
+--- cups-filters-1.0.35.orig/filter/pdftoijs.cxx	2012-09-21 18:36:53.000000000 +0200
++++ cups-filters-1.0.35/filter/pdftoijs.cxx	2013-08-11 19:41:15.935947917 +0200
+@@ -70,11 +70,20 @@
+ }
+ 
+ #if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 19
++#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 23
++void CDECL myErrorFun(void *data, ErrorCategory category,
++    Goffset pos, char *msg)
++#else
+ void CDECL myErrorFun(void *data, ErrorCategory category,
+     int pos, char *msg)
++#endif
+ {
+   if (pos >= 0) {
++#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 23
++    fprintf(stderr, "ERROR (%lld): ", pos);
++#else
+     fprintf(stderr, "ERROR (%d): ", pos);
++#endif
+   } else {
+     fprintf(stderr, "ERROR: ");
+   }
+@@ -297,19 +306,15 @@
+   if (argc == 6) {
+     /* stdin */
+     int fd;
+-    Object obj;
+-    BaseStream *str;
+-    FILE *fp;
++    char name[BUFSIZ];
+     char buf[BUFSIZ];
+     int n;
+ 
+-    fd = cupsTempFd(buf,sizeof(buf));
++    fd = cupsTempFd(name,sizeof(name));
+     if (fd < 0) {
+       pdfError(-1,"Can't create temporary file");
+       exit(1);
+     }
+-    /* remove name */
+-    unlink(buf);
+ 
+     /* copy stdin to the tmp file */
+     while ((n = read(0,buf,BUFSIZ)) > 0) {
+@@ -319,23 +324,10 @@
+ 	exit(1);
+       }
+     }
+-    if (lseek(fd,0,SEEK_SET) < 0) {
+-        pdfError(-1,"Can't rewind temporary file");
+-        close(fd);
+-	exit(1);
+-    }
+-
+-    if ((fp = fdopen(fd,"rb")) == 0) {
+-        pdfError(-1,"Can't fdopen temporary file");
+-        close(fd);
+-	exit(1);
+-    }
+-
+-    obj.initNull();
+-//    parsePDFTOPDFComment(fp); // TODO?
+-    rewind(fp);
+-    str = new FileStream(fp,0,gFalse,0,&obj);
+-    doc = new PDFDoc(str);
++    close(fd);
++    doc = new PDFDoc(new GooString(name));
++    /* remove name */
++    unlink(name);
+   } else {
+     GooString *fileName = new GooString(argv[6]);
+     /* argc == 7 filenmae is specified */
+diff -ruN cups-filters-1.0.35.orig/filter/pdftoopvp/pdftoopvp.cxx cups-filters-1.0.35/filter/pdftoopvp/pdftoopvp.cxx
+--- cups-filters-1.0.35.orig/filter/pdftoopvp/pdftoopvp.cxx	2012-07-20 10:22:23.000000000 +0200
++++ cups-filters-1.0.35/filter/pdftoopvp/pdftoopvp.cxx	2013-08-11 19:41:22.735947778 +0200
+@@ -112,11 +112,20 @@
+ #define MAX_OPVP_OPTIONS 20
+ 
+ #if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 19
++#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 23
++void CDECL myErrorFun(void *data, ErrorCategory category,
++    Goffset pos, char *msg)
++#else
+ void CDECL myErrorFun(void *data, ErrorCategory category,
+     int pos, char *msg)
++#endif
+ {
+   if (pos >= 0) {
++#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 23
++    fprintf(stderr, "ERROR (%lld): ", pos);
++#else
+     fprintf(stderr, "ERROR (%d): ", pos);
++#endif
+   } else {
+     fprintf(stderr, "ERROR: ");
+   }
+@@ -619,9 +628,6 @@
+     char *s;
+     GooString name;
+     int fd;
+-    Object obj;
+-    BaseStream *str;
+-    FILE *fp;
+     char buf[4096];
+     int n;
+ 
+@@ -633,8 +639,6 @@
+     }
+     name.append("/XXXXXX");
+     fd = mkstemp(name.getCString());
+-    /* remove name */
+-    unlink(name.getCString());
+     if (fd < 0) {
+       opvpError(-1,"Can't create temporary file");
+       exitCode = 2;
+@@ -675,23 +679,10 @@
+ 	goto err0;
+       }
+     }
+-    if (lseek(fd,0,SEEK_SET) < 0) {
+-	opvpError(-1,"Can't rewind temporary file");
+-	close(fd);
+-	exitCode = 2;
+-	goto err0;
+-    }
+-
+-    if ((fp = fdopen(fd,"rb")) == 0) {
+-	opvpError(-1,"Can't fdopen temporary file");
+-	close(fd);
+-	exitCode = 2;
+-	goto err0;
+-    }
+-
+-    obj.initNull();
+-    str = new FileStream(fp,0,gFalse,0,&obj);
+-    doc = new PDFDoc(str);
++    close(fd);
++    doc = new PDFDoc(&name);
++    /* remove name */
++    unlink(name.getCString());
+   } else {
+     /* no jcl check */
+     doc = new PDFDoc(fileName.copy());
+diff -ruN cups-filters-1.0.35.orig/filter/pdftoraster.cxx cups-filters-1.0.35/filter/pdftoraster.cxx
+--- cups-filters-1.0.35.orig/filter/pdftoraster.cxx	2013-06-26 17:05:04.000000000 +0200
++++ cups-filters-1.0.35/filter/pdftoraster.cxx	2013-08-11 19:41:15.936947917 +0200
+@@ -185,11 +185,20 @@
+ }
+ 
+ #if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 19
++#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 23
++void CDECL myErrorFun(void *data, ErrorCategory category,
++    Goffset pos, char *msg)
++#else
+ void CDECL myErrorFun(void *data, ErrorCategory category,
+     int pos, char *msg)
++#endif
+ {
+   if (pos >= 0) {
++#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 23
++    fprintf(stderr, "ERROR (%lld): ", pos);
++#else
+     fprintf(stderr, "ERROR (%d): ", pos);
++#endif
+   } else {
+     fprintf(stderr, "ERROR: ");
+   }
+@@ -1762,19 +1771,15 @@
+   if (argc == 6) {
+     /* stdin */
+     int fd;
+-    Object obj;
+-    BaseStream *str;
+-    FILE *fp;
++    char name[BUFSIZ];
+     char buf[BUFSIZ];
+     int n;
+ 
+-    fd = cupsTempFd(buf,sizeof(buf));
++    fd = cupsTempFd(name,sizeof(name));
+     if (fd < 0) {
+       pdfError(-1,const_cast<char *>("Can't create temporary file"));
+       exit(1);
+     }
+-    /* remove name */
+-    unlink(buf);
+ 
+     /* copy stdin to the tmp file */
+     while ((n = read(0,buf,BUFSIZ)) > 0) {
+@@ -1784,23 +1789,10 @@
+ 	exit(1);
+       }
+     }
+-    if (lseek(fd,0,SEEK_SET) < 0) {
+-        pdfError(-1,const_cast<char *>("Can't rewind temporary file"));
+-        close(fd);
+-	exit(1);
+-    }
+-
+-    if ((fp = fdopen(fd,"rb")) == 0) {
+-        pdfError(-1,const_cast<char *>("Can't fdopen temporary file"));
+-        close(fd);
+-	exit(1);
+-    }
+-
+-    obj.initNull();
+-    parsePDFTOPDFComment(fp);
+-    rewind(fp);
+-    str = new FileStream(fp,0,gFalse,0,&obj);
+-    doc = new PDFDoc(str);
++    close(fd);
++    doc = new PDFDoc(new GooString(name));
++    /* remove name */
++    unlink(name);
+   } else {
+     GooString *fileName = new GooString(argv[6]);
+     /* argc == 7 filenmae is specified */