Version bump; qpdf subslot dependency

Package-Manager: portage-2.2.0_alpha186/cvs/Linux x86_64
Manifest-Sign-Key: 0xEBE6A336BE19039C!

4 files changed, 136 insertions, 8 deletions

diff --git a/net-print/cups-filters/ChangeLog b/net-print/cups-filters/ChangeLog
index 6572d58e3678..07233edb76f4 100644
--- a/net-print/cups-filters/ChangeLog
+++ b/net-print/cups-filters/ChangeLog
@@ -1,6 +1,12 @@
 # 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.64 2013/07/05 15:19:35 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/ChangeLog,v 1.65 2013/07/05 23:10:36 dilfridge Exp $
+
+*cups-filters-1.0.35 (05 Jul 2013)
+
+  05 Jul 2013; Andreas K. Huettel <dilfridge@gentoo.org>
+  +cups-filters-1.0.35.ebuild, cups-filters-9999.ebuild:
+  Version bump; qpdf subslot dependency
 
   05 Jul 2013; Jeroen Roovers <jer@gentoo.org> cups-filters-1.0.34-r1.ebuild:
   Stable for HPPA (bug #442926).
diff --git a/net-print/cups-filters/Manifest b/net-print/cups-filters/Manifest
index ad061f46cf7c..08df5397e5a0 100644
--- a/net-print/cups-filters/Manifest
+++ b/net-print/cups-filters/Manifest
@@ -4,14 +4,28 @@ 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
 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 2790 SHA256 8cf56d5d2e32d03e6af3c4cad53de9c7c91d93e97683d3d30cf4aa0506b9df28 SHA512 7ee77055773ef04b904af3ea9d9b2f5163c77f0ea756999ab7f9fd9ce5092a9f9063622d46eca658c5f2856ae353c0ea4bac3d1f193ed3f5e8842c5b81d9fa03 WHIRLPOOL a662c687d9d248ba24f694ce0d0f9657404aca44c3a387d8ce07053ae6b33518156b2c4de91ae640c4f0a10b7493f3f8d2c11205e5b2da9d01b85d1fb915e17c
-EBUILD cups-filters-9999.ebuild 2797 SHA256 d561471b02ec51367b67dd506f68628da81474cf714d561e186853665a10ba80 SHA512 04da2225be0926c90df585884dbc211927022bfa6c0a66f59154207253c71d1e7f7311e6e4be20091720b6e6d1217cc69e9573e09681207ee6ba770ffd7469c8 WHIRLPOOL 185f2e6cd301d1ff55c5cba729472b2df439721f1b25c43342460d2f6cc8a0e9feedcb2ed613ff49f89990edf37537ba4f40faa414a9ced2b9f5173eab5f1e94
-MISC ChangeLog 11568 SHA256 85bfb6544c3cba31d5cbf5d7b0b750f2585ff492fe9a1a360bdeba3225278f32 SHA512 b25d32e5a543ecebb01b53432cbe4275a6f3661c1709300d5d85f20d83d230e3c2e55ff619ff997c43e81324ac1e18845d8cb212a74711827eedd64510324e7d WHIRLPOOL b3c77c89d4ac7cc58bbdb382292c3034812017fc58254688d82fea7987f6cfba0c78542df58c8ddb7eca0dcbb139b068b5381fbf16373d7ea496f49f0857dd10
+EBUILD cups-filters-1.0.35.ebuild 2800 SHA256 f2f6d39227bd2e9b750f5742f25b436f6479079a86c05600998d0178d6145bc9 SHA512 ca47a03411dc00322aeaa02ebfabe0a1821f0c92f9cb1a6247772f0b680960cfd7d41cdd2cff78f3b25ccaab18f8e42a8e674e296fe6b9132b6f7edd09e08f4b WHIRLPOOL de7cdc2ee963ce766905b1f97d9cc189cdc475a062ce2fd48644ac1aa39544320dd6f176947d768f156ad81990231670cfdb7582744e3fe2457877e6e598013f
+EBUILD cups-filters-9999.ebuild 2799 SHA256 44eee588839c569e2c38aea3a18e3610539d143fb6c9eea7d0ddaa024ac8b326 SHA512 ec7934f4f73a367158d2db9c96f1cf6bffba5ec28f0c5a68a375869fb8ca276fa1a4cc511eac20be60e8845d380b67e538a8e76ecd6dca15117ce9254447e108 WHIRLPOOL 6feee947d16df8efcb9496827ca55987ea65c5a64625f0b2887f3673b5572bab704ded4c932ff007b2ab8d6281ad18742de8c55fcf4d93b7ae43cc8f24ef6cae
+MISC ChangeLog 11765 SHA256 fc88a8d6c42e2ed14a7f1473962b31adb0171f40a24393ab3f7258a23fffbfec SHA512 5e38d5184d6a39dddd423e7460de93683e1f711756b6bbc5cf55d938c84df0933052ffce0cca443fa3243d620f1a75c395e106ec57cfe417e83728ecaf95dba8 WHIRLPOOL 4fba23871324892ea8d112b5f02a5927165cf1f7ccc279e137b314365db160f2422eaa0d6569ae44fac88e090b945f4d6f20d025e00dc4ae972ece3b0c07f7db
 MISC metadata.xml 162 SHA256 753dd90680a9d937cb438cbf14dc217d518514d1596682a4e3478b1b7c7ba051 SHA512 ff7cd6e9d088c1ce0107a86a693abddb12d1385e8f9abb2614aa5cb8ed0c046a1387ccab1643fe711e84df1fa23659ce490f68f0504bbb908b7662a0ac490a03 WHIRLPOOL ccbf59144f058b49de3d54bbe6d92e2d2e8b605df10d5143ccfd7e4a021069ca025e87b4179179a60091c03d8bf1e371207c35f1102c2c1f848bf6697e9c2bb2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlHW5AgACgkQVWmRsqeSphN6wgCfTly23An7Mn1oqYHkwmqQD+dB
-pEoAmgJQ+8mHb3U7F85DkswZSvkF7apa
-=vRC2
+iQJ8BAEBCABmBQJR11LtXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
+QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOct7AP+gLF3mXZWc1EbH7hxLxRexwN
+gvQ3tSs/ILL+Hr9scJUzig6itJ3agUGiptkwA6ycbOIsyFip2drvKuWH91Sb1IC5
++M6eRXVubHFZxZ9VsS4w7gvD8alsgBFIAjJnf64c8g93CgQNFB5oQyxHIr52vfPS
+RSA8eFmj6WDT/XvvzSKebREA/Gl822IzywsDAs9SAimZ2QpmypQdpvyi5TF23KJI
+hfa4tq8Bxw2XUt2kvxEL1wQw/08AEEpyGc5cofeKum2MzBKitD+iN+/g29DtTXll
+i3ULo0UZMacIl4Rt036zILt/mkdZRnnuh4F0uM0Q6dBPHEnuZkjxv/CYd4yq4hQw
+YpkjqlXFpvcrpwdE68kM/WcvVeOHLEK/nElQMRxe63YjUmpA2oUpgxkgJyY9ywQA
+H4wOPigUzoLewsKUo4k7gs3iHlDCNhGrf6n2YUFUKPVBLB5CevUN8707CZaEYcQ9
+4x9D43T+XOdNJ5UJeJFApKg+hqyvPZzXdQG1DxH24aIlUunQjEB00HcpFAybfGYc
+XuihFdoDlYNrgudXrMcoTWHC8Hljh3dmahKNKvgqXzhswe6pCT6m59FvyNQQacle
+vZoZqfe8fZIKmQJvpEXDoIHZMvWfAGLYz+3JMFR4i0O8lOZeo7gZmscSbSvEJ2M2
+xan5L0L9ADu5TZo5XjwI
+=v2pt
 -----END PGP SIGNATURE-----
diff --git a/net-print/cups-filters/cups-filters-1.0.35.ebuild b/net-print/cups-filters/cups-filters-1.0.35.ebuild
new file mode 100644
index 000000000000..0ad574ac8d05
--- /dev/null
+++ b/net-print/cups-filters/cups-filters-1.0.35.ebuild
@@ -0,0 +1,108 @@
+# 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.1 2013/07/05 23:10:36 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 ~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 )
+"
+DEPEND="${RDEPEND}"
+
+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-9999.ebuild b/net-print/cups-filters/cups-filters-9999.ebuild
index 86843354c4a4..172bfc1b0511 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.35 2013/05/15 20:00:28 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/cups-filters-9999.ebuild,v 1.36 2013/07/05 23:10:36 dilfridge Exp $
 
 EAPI=5
 
@@ -26,7 +26,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/qpdf-3.0.2
+	>=app-text/qpdf-3.0.2:=
 	media-libs/fontconfig
 	media-libs/freetype:2
 	media-libs/lcms:2