Add missing avahi dependencies, bug 414349.

Package-Manager: portage-2.2.0_alpha101/cvs/Linux x86_64
RepoMan-Options: --force

4 files changed, 28 insertions, 10 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index ab8a5d69ab39..5394cf38edbd 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-print/cups
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.468 2012/05/01 19:31:17 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.469 2012/05/02 21:42:08 dilfridge Exp $
+
+  02 May 2012; Andreas K. Huettel <dilfridge@gentoo.org> cups-1.5.2-r20.ebuild,
+  cups-1.5.2-r4.ebuild:
+  Add missing avahi dependencies, bug 414349.
 
   01 May 2012; Jeroen Roovers <jer@gentoo.org> cups-1.5.2-r4.ebuild:
   Stable for HPPA (bug #411887).
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 2e3e9b28d5fd..0e56e577c058 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX cups-1.4.0-backend-https.patch 483 RMD160 b338f67ebf0719b5e12eaa8490affbd7a1bb8c0e SHA1 bfeadba67792203d654a64bdec16f3d2a31aeca6 SHA256 9060a5d848d6655db4629822d01fd772a3fbe1a5107109c50cb0ecb4de7a9526
 AUX cups-1.4.2-str3200.patch 1654 RMD160 cc40d26f7e9dbe5a12d9426535d09de10254da26 SHA1 b330108bcfb8ca3ab5d6dd3b48dc3d2937c7bca1 SHA256 8a64f5c72d64ecd95d330fd90630eb02a67865c07921ecb0c010e84b49b537e0
@@ -25,14 +25,24 @@ DIST cups-1.5.2-ipp-r8950.patch.bz2 19525 RMD160 346a3141ae445dc9f17c7fbc0a467ae
 DIST cups-1.5.2-source.tar.bz2 9595665 RMD160 98181e2ee8c6e574fb6d405f688f52c9b61a2355 SHA1 56fdb4f58e676607845321c0296c1e90e416883f SHA256 b150aa108c631f4f07e92cb13c01263a67170e5ac8383c5548ef8f8473a187fb
 EBUILD cups-1.4.8-r1.ebuild 7242 RMD160 bf1997ca1d9b9b11066c2bb963cc8b54ea5c8f2a SHA1 a15340529eecbbc8a95392d2f1b508cfb4caa47e SHA256 77271eb2ea0dd120801a4b1e5381ea4859e80375d9587f83ec3f4c37ab8868c8
 EBUILD cups-1.4.8-r23.ebuild 8852 RMD160 c50b3b77403cf6c724fcfd05c8ef173808066629 SHA1 c4aa7016bb5a1279bf446f41c09b9a93d5b87ff2 SHA256 1798aed0e2760c6a92a7c4e3631170989d984ac36908b369c37c43bfdab3cd6d
-EBUILD cups-1.5.2-r20.ebuild 8407 RMD160 11cc592c676903f4f34f486e452f2fa0ea5ea02d SHA1 6b334db527daef059daaad68b2fbadd46423307c SHA256 b9277f2f5b4ab09bc6ff2aeae40e3cd0993defc64a8c48b5d4dfe7eac30221a2
-EBUILD cups-1.5.2-r4.ebuild 8206 RMD160 8760c84d074e2d2586b8db4f8cd4063223b24f12 SHA1 ca59b389881eac071022ed5d3669ba7db3ab1966 SHA256 6b652551c4c58a75094b3be961a148385ce05ffb333635fabbb611e6fcaa171f
-MISC ChangeLog 71251 RMD160 cdaa82063a2f563e85ac62d41db884ea5508e35f SHA1 109da1167734e446ea86f3668c6e1187ebe6af0b SHA256 53ed2e180192c5fce91d09680e9a7bf9f6f19df8457cf25c0d581a4a35fe1828
+EBUILD cups-1.5.2-r20.ebuild 8479 RMD160 840df8e36b94a3c2af0390e50a19417a682c4e90 SHA1 a1024bcbf899873c70552c70a4c1db17123dd68f SHA256 f46b38e8a2ee1033b64166fa8b4650650cd2b5fdd17eeb44ec140ad4a4af9886
+EBUILD cups-1.5.2-r4.ebuild 8284 RMD160 7aac6ddc873c80240a5ddfa9391a3bd2eda4c23c SHA1 5154ee6cbb92eae1341e433a3634fb4a9b454a44 SHA256 824844656274bda2c7a447b4d5ed6686b5228669e134354b564b4a07932d1bed
+MISC ChangeLog 71408 RMD160 00e9f048d3f598d463348b729f4d816644f3c176 SHA1 97fc1d04c51778746fd0a584d9e07e07def4c31f SHA256 186e55f7322846066a5ed92976b011ca2897c8e116ad7b84b22abf618b4608de
 MISC metadata.xml 778 RMD160 39d95458b469079b683adf4f2e79eb0b803ce0b9 SHA1 62b298bb9c5435716ce81550213ccd086ec065aa SHA256 26a8d1221a4334579f98705c38f3e3a882c223df86181dcf7968eac2118188b8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk+gOgoACgkQVWmRsqeSphOJJwCfcVEFkbI/VCgcy+0kJD9tcodT
-wfsAn1m8FxTTKbiaDzo5mesNTrI8+kpn
-=x1qz
+iQIcBAEBCgAGBQJPoapPAAoJENwGBM22xffe+FcP+wR6vyxzvH3hE6BzLC1S0q+X
+JinCBDV65Zun4GyG5UhXOaqiqnBCSGzEw9b4VcMdp0rg4GsAyFS1VDU4oODMjOUq
+r2OB4tHx4MerjU1NjFj5L1mnZUinwrHn0YZOFulIEqifM6gajeBsaSJzY8GfWSM2
+aBYdndNgYkrGkBY7vVqwf3uTOzqC2SqOBafuMGA4CaWrrghptOUmDcsj739fx2o4
+gkIts+usNUHisY2CkjtP8CajGpEYw3d/KoPgBapqF+ml7rtJGzIr5/kg2WKDd/y1
+L/fhn3/b2Qc3zHaksII001j8dEwCvR9gC7nw+T667ZxjPJowPgG93Tc/qf12x8KP
+E/ftuUkmwPywSDmiNbulXOBl8NNaoB7q/JcGoTF0FyPnQK6mQO18UpGbzvz2cOEz
+k6/PUlH8QZNrq36n+XS2720j3tw/wbhof2Trkmm6T0HEkfGVTblWP2RDNHNC63yk
+XIeCqpvJcQ0GSKcQXxVTwgVxkNVPUBoR1wONl585qaPGaFZkF6yyy9d7dduL7YYX
+49XG7H7DBC3uDqWSDb38v0i/KCRSu7h5Hy82Mmshqb0cL+llTFKukmMDThQnAuiT
+nGQEWOPrisQayr+WdzQPMKtKBRaPaTXEHIEiP4RZ7rpbJe1q0kODfYLL71Jb/Yfu
+wmq1Sq6Dj5dKeUXTAwcp
+=8hNy
 -----END PGP SIGNATURE-----
diff --git a/net-print/cups/cups-1.5.2-r20.ebuild b/net-print/cups/cups-1.5.2-r20.ebuild
index 4c0b15848c42..df8aed69f6d4 100644
--- a/net-print/cups/cups-1.5.2-r20.ebuild
+++ b/net-print/cups/cups-1.5.2-r20.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.5.2-r20.ebuild,v 1.1 2012/04/26 21:51:03 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.5.2-r20.ebuild,v 1.2 2012/05/02 21:42:08 dilfridge Exp $
 
 EAPI=4
 
@@ -37,6 +37,7 @@ RDEPEND="
 			sys-apps/attr
 		)
 	)
+	avahi? ( net-dns/avahi )
 	dbus? ( sys-apps/dbus )
 	java? ( >=virtual/jre-1.6 )
 	jpeg? ( virtual/jpeg:0 )
@@ -241,6 +242,7 @@ src_install() {
 
 	# install our init script
 	local neededservices
+	use avahi && neededservices+=" avahi-daemon"
 	use dbus && neededservices+=" dbus"
 	[[ -n ${neededservices} ]] && neededservices="need${neededservices}"
 	cp "${FILESDIR}"/cupsd.init.d "${T}"/cupsd || die
diff --git a/net-print/cups/cups-1.5.2-r4.ebuild b/net-print/cups/cups-1.5.2-r4.ebuild
index 7670b7bc2747..9e82a21eadb2 100644
--- a/net-print/cups/cups-1.5.2-r4.ebuild
+++ b/net-print/cups/cups-1.5.2-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.5.2-r4.ebuild,v 1.3 2012/05/01 19:31:17 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.5.2-r4.ebuild,v 1.4 2012/05/02 21:42:08 dilfridge Exp $
 
 EAPI=4
 
@@ -37,6 +37,7 @@ RDEPEND="
 			sys-apps/attr
 		)
 	)
+	avahi? ( net-dns/avahi )
 	dbus? ( sys-apps/dbus )
 	java? ( >=virtual/jre-1.6 )
 	jpeg? ( virtual/jpeg:0 )
@@ -236,6 +237,7 @@ src_install() {
 
 	# install our init script
 	local neededservices
+	use avahi && neededservices+=" avahi-daemon"
 	use dbus && neededservices+=" dbus"
 	[[ -n ${neededservices} ]] && neededservices="need${neededservices}"
 	cp "${FILESDIR}"/cupsd.init.d "${T}"/cupsd || die