Use zeroconf useflag instead of avahi; clean up

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

5 files changed, 41 insertions, 145 deletions

diff --git a/net-print/cups-filters/ChangeLog b/net-print/cups-filters/ChangeLog
index ae4e4dc7e8c7..633466c1fcd6 100644
--- a/net-print/cups-filters/ChangeLog
+++ b/net-print/cups-filters/ChangeLog
@@ -1,6 +1,11 @@
 # 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.52 2013/03/17 15:39:45 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/ChangeLog,v 1.53 2013/04/01 22:55:53 dilfridge Exp $
+
+  01 Apr 2013; Andreas K. Huettel <dilfridge@gentoo.org>
+  -cups-filters-1.0.29-r1.ebuild, cups-filters-1.0.30.ebuild,
+  cups-filters-9999-r1.ebuild:
+  Use zeroconf useflag instead of avahi; clean up
 
 *cups-filters-1.0.30 (17 Mar 2013)
 
diff --git a/net-print/cups-filters/Manifest b/net-print/cups-filters/Manifest
index c7b0b186cd8f..5baf9ea9d8d4 100644
--- a/net-print/cups-filters/Manifest
+++ b/net-print/cups-filters/Manifest
@@ -5,29 +5,27 @@ AUX cups-browsed.init.d 286 SHA256 9e9724ceefdd07b5e6344dbd3604c5f1a05a5d5349820
 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-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
+EBUILD cups-filters-1.0.30.ebuild 2446 SHA256 8d5435b57cb5437d30eae8c0fc0beeb1333f635f2225920b275e1b28220bf7f0 SHA512 76302e9faf242e414f1314ab24fbd49624c9d898dc4e27d8fb8ac4f1e6817ba9fc5ee5adbff621ffa759f4e5ffd3679dba08d0b257a2c433d287e602c62d44bd WHIRLPOOL 87532076218ddc7d17401bc57ebbf9b680cb480b86989be89319172694eac2e53e038c232741216bc171f0cf45346c259a33df6fdfc12681d0640e61783d94ee
+EBUILD cups-filters-9999-r1.ebuild 2447 SHA256 a1ee37cd6b201306875004bf6d0d76187e348e3561fbaa1bf1af2111c192e77a SHA512 4bc7618c2b7b42d9e3c6b3118f53969d6cfef92697da4a23a1b8f0a339e4eeba1b03483821b9083e50f3cfb607e3efa5a9b08bd32bd6acbda3ebe2f591ba8226 WHIRLPOOL 672df16c6a5fadf7c8d8fc61ac8d4e9590d0ecb48876504b0d74a41651fef79755c44851fa26e08235c38d99e53276dd4cbca9ec4ff81877a0d304c984c41efd
+MISC ChangeLog 9592 SHA256 d4aa7639c2b0363043854f8e070cb84487f44ed2d3539469fa1e9b2897dd9afe SHA512 a1152e5b2349cc25063d8bff72d8c92c69c86dcba7bc0f8a04c5660bc3aec83cf4e2b0ff7355c6f43551c528190f86a9aaaddbb64b2568f0a2713eba5b2f1722 WHIRLPOOL a93755977b41c5b0bf6e6c46840a8a86faf9c14224f83205b8cfc79217a0bf9b3a00ab07f6ca2b12863e014b53823bb59536c0bc419f5c75f722ec1cd4067644
 MISC metadata.xml 162 SHA256 753dd90680a9d937cb438cbf14dc217d518514d1596682a4e3478b1b7c7ba051 SHA512 ff7cd6e9d088c1ce0107a86a693abddb12d1385e8f9abb2614aa5cb8ed0c046a1387ccab1643fe711e84df1fa23659ce490f68f0504bbb908b7662a0ac490a03 WHIRLPOOL ccbf59144f058b49de3d54bbe6d92e2d2e8b605df10d5143ccfd7e4a021069ca025e87b4179179a60091c03d8bf1e371207c35f1102c2c1f848bf6697e9c2bb2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQJ8BAEBCABmBQJRRePsXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJRWhCwXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 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
+QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcX7QQAKPb50Pxku/rBYv48lFlhXne
+mCygtUx7FkaK6klL6EPQ7gNGSHfFk3ppgrMwCZhxL/Cbru9NxB6lHE/zk3Y0bbpR
+/NN8rSeqytDYDccGcjRVR3gT/nalQDu83E6nCIjEUmNYvgH7mQB250eNvv4xAc+I
+BX61TaIbcdlefW+3YQa5BVWlFVA+tJ8HKzAzfNHYij+MyuzLBEVvsXKOCb/l9LQV
+gQK5682FOcqpAensv+oe9qdah2Xh/4jUXQsO4CV7BHbz8QIgYX6Ijy9eSND5pfoO
+MSiGwIGtPfQirNh3L+88DR/HyGnJtrYpVGEHnfEwUXbAidLAW8B38oVbpyxggVyg
+67hcG8EaKc5vAaN6biQ/QjymZL27t5NWhiY4GpsC3EmhaXpulXbLndltdOHwPvHT
+ZwVeL3OhZRzOD9SjR/yucMgmNC+3qN6NCTEQVkC+xWIGd+fJo9o8L/tfTHki/bkW
+CnJmAqZXGSvdFxOvn70gQP2uFItRiNqPEXY9XA3DCbLhWPOs/0XO52F6GAYnj2ZT
+2wy9+K4zxpt639AYkGUpPh/ekQInP7d91kilhI7+2fJnJ+EZGbpluf0cg/Ajgxii
+E/riDL8WKXxwWoyTglg4JwXshENjydFJU35qdAWY2u7UFqHNsX1PCYfv9huDy+eO
+8AY4k9MiUOrpVGfzry/8
+=8rfJ
 -----END PGP SIGNATURE-----
diff --git a/net-print/cups-filters/cups-filters-1.0.29-r1.ebuild b/net-print/cups-filters/cups-filters-1.0.29-r1.ebuild
deleted file mode 100644
index 8c7d45e4316e..000000000000
--- a/net-print/cups-filters/cups-filters-1.0.29-r1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# 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.29-r1.ebuild,v 1.1 2013/02/21 11:41:20 scarabeus Exp $
-
-EAPI=4
-
-GENTOO_DEPEND_ON_PERL=no
-
-inherit base perl-module autotools
-
-if [[ "${PV}" == "9999" ]] ; then
-	inherit autotools 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.29-poppler-0.22.patch")
-
-src_prepare() {
-	base_src_prepare
-	if [[ "${PV}" == "9999" ]]; then
-		eautoreconf
-	else
-		eautoreconf
-	fi
-}
-
-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
-
-	find "${ED}" -name '*.la' -exec rm -f {} +
-
-	if use avahi; then
-		newinitd "${FILESDIR}"/cups-browsed.init.d cups-browsed
-	fi;
-}
-
-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-1.0.30.ebuild b/net-print/cups-filters/cups-filters-1.0.30.ebuild
index cc9f14630407..edca1e888e69 100644
--- a/net-print/cups-filters/cups-filters-1.0.30.ebuild
+++ b/net-print/cups-filters/cups-filters-1.0.30.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.30.ebuild,v 1.1 2013/03/17 15:39:45 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/cups-filters-1.0.30.ebuild,v 1.2 2013/04/01 22:55:53 dilfridge Exp $
 
 EAPI=5
 
@@ -21,7 +21,7 @@ HOMEPAGE="http://www.linuxfoundation.org/collaborate/workgroups/openprinting/pdf
 
 LICENSE="MIT GPL-2"
 SLOT="0"
-IUSE="avahi jpeg perl png static-libs tiff"
+IUSE="jpeg perl png static-libs tiff zeroconf"
 
 RDEPEND="
 	app-text/ghostscript-gpl
@@ -34,11 +34,11 @@ RDEPEND="
 	!<=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 )
+	zeroconf? ( net-dns/avahi )
 "
 DEPEND="${RDEPEND}"
 
@@ -55,7 +55,7 @@ src_prepare() {
 src_configure() {
 	econf \
 		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		$(use_enable avahi) \
+		$(use_enable zeroconf avahi) \
 		$(use_enable static-libs static) \
 		--with-fontdir="fonts/conf.avail" \
 		--with-pdftops=pdftops \
@@ -89,16 +89,15 @@ src_install() {
 
 	prune_libtool_files --all
 
-	use avahi && newinitd "${FILESDIR}"/cups-browsed.init.d cups-browsed
+	use zeroconf && newinitd "${FILESDIR}"/cups-browsed.init.d cups-browsed
 }
 
 pkg_postinst() {
 	perl-module_pkg_postinst
 
-	if use avahi; then
+	if use zeroconf; 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."
+		elog "to add it to your default runlevel. Not much tested so far, though."
 	fi
 }
diff --git a/net-print/cups-filters/cups-filters-9999-r1.ebuild b/net-print/cups-filters/cups-filters-9999-r1.ebuild
index 3002fe86a0a2..93182c0d81f7 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.2 2013/03/17 15:39:45 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/cups-filters-9999-r1.ebuild,v 1.3 2013/04/01 22:55:53 dilfridge Exp $
 
 EAPI=5
 
@@ -21,7 +21,7 @@ HOMEPAGE="http://www.linuxfoundation.org/collaborate/workgroups/openprinting/pdf
 
 LICENSE="MIT GPL-2"
 SLOT="0"
-IUSE="avahi jpeg perl png static-libs tiff"
+IUSE="jpeg perl png static-libs tiff zeroconf"
 
 RDEPEND="
 	app-text/ghostscript-gpl
@@ -34,15 +34,18 @@ RDEPEND="
 	!<=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 )
+	zeroconf? ( net-dns/avahi )
 "
 DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}/${PN}-1.0.29-openrc.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-1.0.29-openrc.patch"
+	"${FILESDIR}/${PN}-1.0.30-noavahi.patch"
+)
 
 src_prepare() {
 	base_src_prepare
@@ -52,7 +55,7 @@ src_prepare() {
 src_configure() {
 	econf \
 		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		$(use_enable avahi) \
+		$(use_enable zeroconf avahi) \
 		$(use_enable static-libs static) \
 		--with-fontdir="fonts/conf.avail" \
 		--with-pdftops=pdftops \
@@ -86,16 +89,15 @@ src_install() {
 
 	prune_libtool_files --all
 
-	use avahi && newinitd "${FILESDIR}"/cups-browsed.init.d cups-browsed
+	use zeroconf && newinitd "${FILESDIR}"/cups-browsed.init.d cups-browsed
 }
 
 pkg_postinst() {
 	perl-module_pkg_postinst
 
-	if use avahi; then
+	if use zeroconf; 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."
+		elog "to add it to your default runlevel. Not much tested so far, though."
 	fi
 }