Version bump; poppler subslot dependencies

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

5 files changed, 169 insertions, 18 deletions

diff --git a/net-print/cups-filters/ChangeLog b/net-print/cups-filters/ChangeLog
index 47f09275c60c..ae4e4dc7e8c7 100644
--- a/net-print/cups-filters/ChangeLog
+++ b/net-print/cups-filters/ChangeLog
@@ -1,6 +1,13 @@
 # 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.51 2013/02/21 11:41:20 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/ChangeLog,v 1.52 2013/03/17 15:39:45 dilfridge Exp $
+
+*cups-filters-1.0.30 (17 Mar 2013)
+
+  17 Mar 2013; Andreas K. Huettel <dilfridge@gentoo.org>
+  +cups-filters-1.0.30.ebuild, +files/cups-filters-1.0.30-noavahi.patch,
+  cups-filters-9999-r1.ebuild:
+  Version bump; poppler subslot dependencies
 
 *cups-filters-1.0.29-r1 (21 Feb 2013)
 *cups-filters-9999-r1 (21 Feb 2013)
diff --git a/net-print/cups-filters/Manifest b/net-print/cups-filters/Manifest
index 4bfe5046a497..c7b0b186cd8f 100644
--- a/net-print/cups-filters/Manifest
+++ b/net-print/cups-filters/Manifest
@@ -4,25 +4,30 @@ Hash: SHA256
 AUX cups-browsed.init.d 286 SHA256 9e9724ceefdd07b5e6344dbd3604c5f1a05a5d5349820345f4c3f44d5a28d8fb SHA512 cdf0bc47c0c3c9c3927ea069fcae798e95244394efaa8b662d316d3715003b9387672b99abf57b4fa4a7d7ae5b68f46081b2b62a490cf2377b28fdd9ec121399 WHIRLPOOL b485e410475fa3beee18113776c886fa102552ccb488241d00797ba66871b0df0eb67f4d63819c5541b63edca419d4a452b4054a9a1f044d2bb0ffde0e2b12d1
 AUX cups-filters-1.0.29-openrc.patch 1287 SHA256 5849051486df2a66e93335a7716026370053e577b2d458e93cac36bc43f4bc5a SHA512 432cdca199f01d57910e260c3eda57615dfa3608b7484c18c29b3c00a815aeb280369ae8192ac3f38f43082356bbaa697b9ae7f867cae2cd2bcf604b55206774 WHIRLPOOL 850396b3d6db72ed98a74c1462404f4b5c484ed49b2739a7b53e6458190ae5405930b04c930a6786d8723b50f9c6c171547542a4bcb77ae156d9cd3c826bf273
 AUX cups-filters-1.0.29-poppler-0.22.patch 2402 SHA256 a21ea426f26fb8149e9e1972514053a86cf5958c732857f451d3123a2c7e6c1e SHA512 da5c3a1d5b5f28e51544c81210d3fb557216f848a290699e5c500601a64ba91428d6ff3aaa406e970c3f8e401ae9d62cf18ff1645640bb3dd880ac446a2b8384 WHIRLPOOL 17167112e503aaf45ec41b2aefca97e914988ac9af67ba67774554604e9ee1c86e9046ca629284d62d32644a925e55463522d10a7ee6c37092a47400728e88f2
+AUX cups-filters-1.0.30-noavahi.patch 1083 SHA256 b29d3d7cda682a99ba5368514b6f08bdb6c89caa38c71ba2ea6817fd383fba8a SHA512 0e4c904bbdc3ff35e76d378a37c79023ad3162a155c8cf259d6c860d1e9e02877c3de992b6fa0b6375848c27cdd656478be54c495c0a8721e9c479825d02982c WHIRLPOOL 329bb267e99b777cd697a124397ba336d6ce9e4965632e8375a821d33b8b71c244e5f95a22716c9fac5ad05b6b7628ef71876a51f7998a84c49f283ec5f1fb1b
 DIST cups-filters-1.0.29.tar.xz 1007112 SHA256 71e5c0cc23ffb200773ee8043f9e7dfee06378b03547d9da843d587c5d07f3c1 SHA512 a53ea0a4cc1673e0a4ec7da1273f3a750f006eb418cef708eea19ddcd66d134cd8c1e304b44b0c1d8ef7dd293f163947c5c8a7e9a890d1bd1f4a91d9508a0c4a WHIRLPOOL 76775c9d0fa779b9e09ca372292cfe4976bea4c390611b5560d0a09f17db8cf2982b0f55e9d1db14f73cf6f816c76b701b7a77d599f595bcdef62e0fc4c93b62
+DIST cups-filters-1.0.30.tar.xz 1014756 SHA256 2b4f4cdd9bebb7c1db4cedcd5084c2243affbacc5fa8b94506caa67d70bd5531 SHA512 a9bdfa7251427e0a11a17b27aa60f85ac4a737e6e0faafb74718e5e50df4a9772d5997ee3b24b795af9700f1805694e9d58d93aa7c92fad04e3ed3df6ca5adbc WHIRLPOOL f917d6696b1af184124a86cd4942235982a95b642c234a0bb9b87f88d29d34f083df8b5ee8c80cc585bab527c1a00fbf002d377bbae9175956fee248a30d8849
 EBUILD cups-filters-1.0.29-r1.ebuild 2621 SHA256 2178d3812177a5e045b3f629e489a0e2df511743ce66370faa7acc9709e2ab9b SHA512 9e58422d76906ed0f63bda0e2032fd5abe0bfbdbb62ea5d1796190faf3456a6f3f0b3b4314a50791a06b2a5cec8c04d0e4e2c2faf9ab5430afb2f2a734173cec WHIRLPOOL 6b0466c74be7f02b199b5151608e112ef7dbb910b83b9aa5427fabdd2ec62503bb18bcbf9d542af04b719f59ccda49b24ca835fb6ed6c55a1b50b6978d37d0bc
-EBUILD cups-filters-9999-r1.ebuild 2481 SHA256 e513a0282ae667fc9d1b40a1ad1c8eec56e292e2aa3d3aae57a80c9a238a4470 SHA512 582c55c874b43db2e69a398b880671c03b386ef48dda08cdc4120ecca9491fb4fc27833bf27e0ad9a3cbbe5a3973a7d6b6e96b61a5932aaaf83a8cbc6f0af7e9 WHIRLPOOL 82d54e42a56b1804e756ae18e2e8f0bc64185fe4b87ae126518274f85733bf904cf3e5412e4f1fa398651897d681ae6161719ffcbfbf69b5fa2bc83086b1f0ea
-MISC ChangeLog 9148 SHA256 89ec3f1fcb2b24864c476a0e624627dc99ed01739472ca19df9e3ea7e574d428 SHA512 9c73b020826ea0b9f30321fc531a5e3343907547e1a60996f7039eead4dd724f06b3a8036a6c5a65025439eee1e776fb8d41aad150bdad223c664daf9c1515cd WHIRLPOOL cbd0b7a24196e74f0e624885ceca0b941be071f71046e87df9f625292de4143a6e8012507f82cab46568017285c09e52e4a75803b267f6143058ef82a437ba7f
+EBUILD cups-filters-1.0.30.ebuild 2525 SHA256 f699a731690830c5672dc3e6c4d7c5ef114e5503f6f69df5fb74186c67d134f4 SHA512 39b46c3d4b45d98f0a1747a1cca101704dee80bd98b6ccba78306e924b5b11c3ba813ec015c86ba35c4d3bf8f45d2b3eb3da70ae4de95bc331af27a4edef2b72 WHIRLPOOL 26c990ab4fbc8ae6b16c1e24e88fe95040cc64aae6c9f5d8dac0e5153460ff14ba2ae7ab65a6979fe1cf85c3e6f9dc6a97fcc8fc1c1d0e07d01838844b431c94
+EBUILD cups-filters-9999-r1.ebuild 2483 SHA256 cbb132d274a1429bb41599a9604c944c45512cb448866894cd0a3808c222ce45 SHA512 0496d784bfc936f62b05aea7ce9261bd54a7ac8143983ade7ce32112cfa198f8892aec7d48b220d6c367e90f5cce70e2a75a5840d69aa7b12238478018902338 WHIRLPOOL 9cc94e2edca15f27e3fbf79cdd6e46da38aa0a007e3cb0800781637b21aad7ae14ffb2336ad2e14fefcbd8f22e73ad3d8f6b12b04d37029c799d4b20538f281c
+MISC ChangeLog 9391 SHA256 c9f7f4cf84e12804adc4775d66e1f4ad8a3ed8dcbc83b43e4295a5e7a1bfa06c SHA512 5c7dc0cdc75b089730078995b6c5fdb18f38a215557548b9bd39c322f59688d5567261c478477cc4920f9b08db052fcc6ffabff6366b79c356857fd6909030ce WHIRLPOOL a96fe33c30d7644cee1ba907bfb21e53963839349d8dc68767b1f5ef05760023dd644946d19bc0878d5222577651dd6426ed5f18385350b0ba5d2095c500c2cf
 MISC metadata.xml 162 SHA256 753dd90680a9d937cb438cbf14dc217d518514d1596682a4e3478b1b7c7ba051 SHA512 ff7cd6e9d088c1ce0107a86a693abddb12d1385e8f9abb2614aa5cb8ed0c046a1387ccab1643fe711e84df1fa23659ce490f68f0504bbb908b7662a0ac490a03 WHIRLPOOL ccbf59144f058b49de3d54bbe6d92e2d2e8b605df10d5143ccfd7e4a021069ca025e87b4179179a60091c03d8bf1e371207c35f1102c2c1f848bf6697e9c2bb2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRJgihAAoJEOSiRoyO7jvoaPEQALNdujWAMwoPjvCwFfYNokq9
-+/YhNtmE9pTv++/bQpku+1uPlE6zKo1mGrOxGGQoJ4gY5DBg+AmvuEicfRdjNV+1
-BvaykrBUQ/r4R0QSv1kmNRg7yaJyGvJka97td3KRfM/M14PdlioMOSAu0j/ifF9n
-rZ5O3/rEqSlaYRzj9O8FqwCUm0iAzxWCGpAahDT3lqnQc+HXTvGiM6kt1ox03VfK
-rUh02dsoFl0YMXtBrIM0ShKVfqFNtVfySPlrNscgrSOuBZOOqm3VnvLvPyqrMA8w
-e8JHNc5PPtVb+TEUhCnuqQMwWzPiBfqlicSs7Q0GbKnOfpcgHUwOZhGt6dqoS7p6
-BdUZP9VqX6/RYQWPE9Gh/ZCztPKLJ1jNlbFDn96QxTFAa4fK1Oikf060L//DQLP2
-cDRXp7OmzQI7Gt9AufizuSz4qknSaKKswkB4ofzJbTeRRvucAjzs1hYBEBzlW5G6
-ARQO+Z/XUcSknXHilGkX9RF8kObspMW4VATa4uUWvas1VvNXDJZ0kPj+QMGS7csA
-pq+HF2rvwhPDgXG4KBmTLRzB7Cea4hJb1zXglv0ruLN0HxsDPqgsAS4s81kmpfxm
-TwSWR37e42mczj+8ue/X2HqXgRP3ksgfMdDvPvx2r/6Xeyj1h1oAQMnYkzD/OttR
-6sRMW0pJn3s1e3TH3udY
-=kvXi
+iQJ8BAEBCABmBQJRRePsXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
+QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcL9IQAObIbRVPxEmnfN96FpzwvPhh
+9iEelTHjV7pfFjRw/gECKa6TWA0gpYkn4Q70mBjIwyEiqZN1cJTsLq5908K7noLO
+bsa/RbaIgL31FUVQeqerxyqVUQtNYubVszW520GGL8Gy+P9zOPb9wox6E6AqvtqO
+ITaQOj366W30GsY/Z1ej1I/nvE+RoDeTFDhMCtYKUOB5LNVRTsMqYPvukx0BwMsP
+ey1qZ5tOLJqS1gGH857SbYxnZev9UmEyRgehVkBAQrvtv6MUavSahNgfZoEXCTZT
+l4VDj/0SlwA3+862PFQnNqpbmur9Dp5zx61Pohfcl29Kg7zCnOIIzzy4nNEYZC9K
+DplSvaHqlgyJ1VrDIDa1BfIAM+DDWr18mX2QcMcbqo4geDQXOxrkjk2JcY9fgIsM
++iK9r6j7KmILpHEOuVqA3BBx1MSq0BTTFv6VDgrmXOXQJL0PA5h00H/K6RD4p8DF
+ytWyeyyBTQFKO+yLgEwse2znhBRhTMF1cqZUYlGyeoLRYX1Q/7UQ8pXOqeZibWBW
+DZskBtja0+VK7JPE1jCapv9WDrGivd55hCjeFT5SjkSjAwo/P7q8vF8StY4nP3iG
+FKoCEyt9DYS3OvmtlBokQLBqR6Yva4p8f51dkkeR9TxtT6J1+qudVD3cvt6zQIZJ
+9mpCKpk+J2KIk9dr9c+/
+=NEnB
 -----END PGP SIGNATURE-----
diff --git a/net-print/cups-filters/cups-filters-1.0.30.ebuild b/net-print/cups-filters/cups-filters-1.0.30.ebuild
new file mode 100644
index 000000000000..cc9f14630407
--- /dev/null
+++ b/net-print/cups-filters/cups-filters-1.0.30.ebuild
@@ -0,0 +1,104 @@
+# 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.30.ebuild,v 1.1 2013/03/17 15:39:45 dilfridge Exp $
+
+EAPI=5
+
+GENTOO_DEPEND_ON_PERL=no
+
+inherit base eutils perl-module autotools
+
+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="avahi jpeg perl png static-libs tiff"
+
+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
+	avahi? ( net-dns/avahi )
+	jpeg? ( virtual/jpeg )
+	perl? ( dev-lang/perl )
+	png? ( media-libs/libpng )
+	tiff? ( media-libs/tiff )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.0.29-openrc.patch"
+	"${FILESDIR}/${PN}-1.0.30-noavahi.patch"
+)
+
+src_prepare() {
+	base_src_prepare
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		$(use_enable 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) \
+		--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
+
+	use avahi && newinitd "${FILESDIR}"/cups-browsed.init.d cups-browsed
+}
+
+pkg_postinst() {
+	perl-module_pkg_postinst
+
+	if use avahi; then
+		elog "This version of cups-filters includes cups-browsed, a daemon that autodiscovers"
+		elog "remote queues via avahi and adds them to your cups configuration. You may want"
+		elog "to add it to your default runlevel. Then again, you may not want to do that,"
+		elog "since it is completely untested, may kill kittens or get you r00ted. Your choice."
+	fi
+}
diff --git a/net-print/cups-filters/cups-filters-9999-r1.ebuild b/net-print/cups-filters/cups-filters-9999-r1.ebuild
index eb8e71011bca..3002fe86a0a2 100644
--- a/net-print/cups-filters/cups-filters-9999-r1.ebuild
+++ b/net-print/cups-filters/cups-filters-9999-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-9999-r1.ebuild,v 1.1 2013/02/21 11:41:20 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/cups-filters-9999-r1.ebuild,v 1.2 2013/03/17 15:39:45 dilfridge Exp $
 
 EAPI=5
 
@@ -25,7 +25,7 @@ IUSE="avahi jpeg perl png static-libs tiff"
 
 RDEPEND="
 	app-text/ghostscript-gpl
-	app-text/poppler[cxx,jpeg?,lcms,tiff?,xpdf-headers(+)]
+	app-text/poppler:=[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/files/cups-filters-1.0.30-noavahi.patch b/net-print/cups-filters/files/cups-filters-1.0.30-noavahi.patch
new file mode 100644
index 000000000000..1177f4d8f99e
--- /dev/null
+++ b/net-print/cups-filters/files/cups-filters-1.0.30-noavahi.patch
@@ -0,0 +1,35 @@
+diff -ruN cups-filters-1.0.30.orig/configure.ac cups-filters-1.0.30/configure.ac
+--- cups-filters-1.0.30.orig/configure.ac	2013-03-07 19:19:51.000000000 +0100
++++ cups-filters-1.0.30/configure.ac	2013-03-17 16:34:35.000000000 +0100
+@@ -204,6 +204,10 @@
+ dnl Check for pkg-config, which is used for some other tests later on...
+ AC_PATH_PROG(PKGCONFIG, pkg-config)
+ 
++PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.30.2])
++AC_SUBST(GLIB_CFLAGS)
++AC_SUBST(GLIB_LIBS)
++
+ dnl Avahi for cups-browsed
+ AVAHI_LIBS=""
+ AVAHI_CFLAGS=""
+@@ -229,6 +233,8 @@
+ 		AVAHI_CFLAGS="$AVAHI_CFLAGS `$PKGCONFIG --cflags avahi-client`"
+ 		AVAHI_LIBS="$AVAHI_LIBS `$PKGCONFIG --libs avahi-client`"
+ 		AC_DEFINE(HAVE_AVAHI, [], [Define if you have the avahi library])
++
++		PKG_CHECK_MODULES(AVAHI_GLIB, [avahi-glib])
+ 	else
+ 		AC_MSG_RESULT(no)
+ 	fi
+@@ -237,11 +243,6 @@
+ AC_SUBST(AVAHI_LIBS)
+ AC_SUBST(AVAHI_CFLAGS)
+ 
+-PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.30.2])
+-AC_SUBST(GLIB_CFLAGS)
+-AC_SUBST(GLIB_LIBS)
+-
+-PKG_CHECK_MODULES(AVAHI_GLIB, [avahi-glib])
+ AC_SUBST(AVAHI_GLIB_CFLAGS)
+ AC_SUBST(AVAHI_GLIB_LIBS)
+